8月15日

src/api/dialysis.js

@@ -363,3 +363,11 @@ export function getDialysisParameterGoodList(params) {
     params: params
   })
 }
+
+export function saveHisDialysis(params) {
+  return request({
+    url: '/api/patinet/savehisdialysis',
+    method: 'get',
+    params: params
+  })
+}

src/api/dialysis_record.js

@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -62,7 +62,8 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
     change_nurse: change_nurse,
     difficult_puncture_nurse: difficult_puncture_nurse,
     new_fistula_nurse: new_fistula_nurse,
-    blood_drawing: blood_drawing
+    blood_drawing: blood_drawing,
+    quality_nurse_id: quality_nurse
   }
   console.log('params', params)
   return request({

src/router/modules/dialysis.js

@@ -87,6 +87,20 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/consumable/dialysis/print',
+      component: () => import('@/xt_pages/dialysis/details/consumable/signPrint'),
+      name: '标签打印',
+      is_menu: false,
+      hidden: true
+    },
+    {
+      path: '/dialysis/consumable/dialysis/parameter/print',
+      component: () => import('@/xt_pages/dialysis/details/consumable/dialysisParameterPrint'),
+      name: '透析参数打印',
+      is_menu: false,
+      hidden: true
+    },
     {
       path: '/dialysis/consumableDrugs_print',
       component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -111,8 +111,8 @@
           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
           
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
 
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

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

@@ -43,28 +43,13 @@
         </div>
       </div>
       <div>
+        <el-button size="small" icon="el-icon-printer" @click="toSett" type="primary" v-if="his_config.is_open == 1">设置</el-button>
         <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">打印</el-button>
         <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">导出</el-button>
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
       </div>
     </div>
-    <!-- <div class="cell clearfix" style="justify-content: space-between;">
-      <div style="display:flex;">
-        <label class="title"> <span class="name">出库状态</span> : </label>
-        <div class="time">
-          <ul class>
-            <li
-              :class="item.id == goodType ? 'active' : ''"
-              @click="selectGoodType(item.id)"
-              v-for="item in goodList"
-              :key="item.id"
-            >
-              {{ item.name }}
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div> -->
+   
     <div>
       <el-table
         :data="list"
@@ -204,13 +189,50 @@
       </span>
     </el-dialog>
 
+
+    <el-dialog
+      title="设置"
+      :visible.sync="startDialogVisibleOne"
+      width="60%">
+      <span>
+        <div v-for="(item,index) in goodTypeList" :key="index">
+          <span v-if="index == 0"><el-checkbox v-model="checkedOne" >{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 1"><el-checkbox v-model="checkedTwo" >{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 2"><el-checkbox v-model="checkedThree" >{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 3"><el-checkbox v-model="checkedFour" >{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 4"><el-checkbox v-model="checkedFive" >{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 5"><el-checkbox v-model="checkedSix" >{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 6"><el-checkbox v-model="checkedSeven" >{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 7"><el-checkbox v-model="checkedEnight" >{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 8"><el-checkbox v-model="checkedNight" >{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 9"><el-checkbox v-model="checkedTen" >{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 10"><el-checkbox v-model="checkedEleven">{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 11"><el-checkbox v-model="checkedTwenty">{{item.type_name}}</el-checkbox></span>
+          <span v-if="index == 12"><el-checkbox v-model="checkedTwentyOne">{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 13"><el-checkbox v-model="checkedTwentyTwo">{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 14"><el-checkbox v-model="checkedTwentyThree">{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 15"><el-checkbox v-model="checkedTwentyFour">{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 16"><el-checkbox v-model="checkedTwentyFive">{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 17"><el-checkbox v-model="checkedTwentySix">{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 18"><el-checkbox v-model="checkedTwentySeven">{{item.type_name}}</el-checkbox></span>
+          <span v-if="index == 19"><el-checkbox v-model="checkedTwentyEight">{{item.type_name}}</el-checkbox></span> 
+          <span v-if="index == 20"><el-checkbox v-model="checkedTwentyNight">{{item.type_name}}</el-checkbox></span>   
+        </div>
+        
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="startDialogVisibleOne = false">取 消</el-button>
+        <el-button type="primary" @click="saveHisDialysis">确 定</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
 
 <script>
-  import { GetAllZone,getPatientDialysisSolutionGroupList,getDialysisGoodTotalCount } from '@/api/dialysis'
-
+  import { GetAllZone,getPatientDialysisSolutionGroupList,getDialysisGoodTotalCount,saveHisDialysis } from '@/api/dialysis'
+ import {GetAllGoodType} from '@/api/stock'
   import { uParseTime } from "@/utils/tools";
   import { getDataConfig } from '@/utils/data'
   export default {
@@ -277,6 +299,32 @@
         tableList:[],
         schedule_type:0,
         partion_type:0,
+        goodTypeList:[],
+        his_config:"",
+        startDialogVisibleOne:false,
+        type_name:false,
+        checkedOne:false,
+        checkedTwo:false,
+        checkedThree:false,
+        checkedFour:false,
+        checkedFive:false,
+        checkedSix:false,
+        checkedSeven:false,
+        checkedEnight:false,
+        checkedNight:false,
+        checkedTen:false,
+        checkedEleven:false,
+        checkedTwenty:false,
+        checkedTwentyOne:false,
+        checkedTwentyTwo:false,
+        checkedTwentyThree:false,
+        checkedTwentyFour:false,
+        checkedTwentyFive:false,
+        checkedTwentySix:false,
+        checkedTwentySeven:false,
+        checkedTwentyEight:false,
+        checkedTwentyNight:false,
+        
       }
     },
     created() {
@@ -312,6 +360,9 @@
       this.getlist()
     },
     methods: {
+      exportList(){
+
+      },
       open(){
        this.getlist()
       },
@@ -319,6 +370,9 @@
         getPatientDialysisSolutionGroupList(this.query).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
+             var config = response.data.data.config
+             this.his_config = config
+           
              if(list!=null){
                for(let i=0;i<list.length;i++){
                  list[i].rowList = []
@@ -562,40 +616,12 @@
       handleScheduleDateChange(val) {
         this.query.schedule_date = val
         this.query.page = 1
-       
+        this.getlist()
       },
       search() {
         this.query.page = 1
-       
+        this.getlist()
       },
-
-      exportList(){
-         import('@/vendor/Export2Excel').then(excel => {
-
-
-
-         var arrTwo = []
-         for(let i=0;i<this.arrKey.length;i++){
-            arrTwo.push('name'+i)
-         }
-         console.log("arrKey88888",arrTwo)
-
-         const tHeader = this.good_types
-         const filterVal = arrTwo
-         console.log("thedad",tHeader)
-         console.log("filterval",filterVal)
-         console.log("33333",this.arrList)
-         const data = this.formatJson(filterVal,this.arrList)
-         console.log("data",data)
-
-         excel.export_json_to_excel({
-           header: tHeader,
-           data,
-           filename: '透析耗材查询'
-         })
-          this.downloadLoading = false
-        })
-       },
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
@@ -931,8 +957,281 @@
         }
       }
       return name
+    },
+    toSett(){
+      GetAllGoodType().then(response=>{
+        if(response.data.state == 1){
+          this.goodTypeList = response.data.data.goodType
+          this.startDialogVisibleOne = true
+        }
+      }) 
+    },
+    saveHisDialysis(){ 
+      var index = 0
+      var arr = []
+      if(this.checkedOne == true){
+         index = 0
+      }else{
+        index = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+      
+     var index_one = 0
+     if(this.checkedTwo == true){
+        index_one = 1
+      }else{
+        index_one = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_one == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+   
+    var index_two = 0
+    if(this.checkedThree == true){
+        index_two = 2
+      }else{
+        index_two = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_two == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+    
+    var index_three = 0
+     if(this.checkedFour == true){
+        index_three = 3
+      }else{
+        index_three = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_three == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+     
+     var index_four = 0
+      if(this.checkedFive == true){
+        index_four = 4
+      }else{
+        index_four = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_four == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+      
+      var index_five = 0
+      if(this.checkedSix == true){
+        index_five = 5
+      }else{
+        index_five = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_five == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+     
+     var index_six = 0
+     if(this.checkedSeven == true){
+        index_six = 6
+      }else{
+        index_six = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_six == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+     
+     var index_seven = 0
+      if(this.checkedEnight == true){
+        index_seven = 7
+      }else{
+        index_seven = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_seven == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+
+    var index_eight =0
+
+    if(this.checkedNight == true){
+        index_eight = 8
+      }else{
+        index_eight = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_eight == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+   
+   var index_night = 0
+    if(this.checkedTen == true){
+        index_night = 9
+      }else{
+        index_night = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_night == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+     
+     var index_ten = 0
+     if(this.checkedEleven == true){
+        index_ten = 10
+      }else{
+        index_ten = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_ten == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+     
+     var index_eleven =0
+     if(this.checkedTwenty == true){
+        index_eleven = 11
+      }else{
+        index_eleven = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_eleven == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+
+    var index_twenty_one = 0
+     if(this.checkedTwentyOne == true){
+        index_twenty_one = 12
+      }else{
+        index_twenty_one = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_twenty_one == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+    
+    var index_twenty_two = 0
+     if(this.checkedTwentyTwo == true){
+        index_twenty_two = 13
+      }else{
+        index_twenty_two = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_twenty_two == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+    
+     var index_twenty_three = 0
+     if(this.checkedTwentyThree == true){
+        index_twenty_three = 14
+      }else{
+        index_twenty_three = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_twenty_three == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+     
+     var index_twenty_four = 0
+      if(this.checkedTwentyFour == true){
+        index_twenty_four = 15
+      }else{
+        index_twenty_four = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_twenty_four == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+     
+     var index_twenty_five = 0
+     if(this.checkedTwentyFive == true){
+        index_twenty_five = 16
+      }else{
+        index_twenty_five = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_twenty_five == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+     
+     var index_twenty_six = 0
+     if(this.checkedTwentySix == true){
+        index_twenty_six = 17
+      }else{
+        index_twenty_six = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_twenty_six == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+
+     var index_twenty_seven = 0
+     if(this.checkedTwentySeven == true){
+        index_twenty_seven = 18
+      }else{
+        index_twenty_seven = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_twenty_seven == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+     
+     var index_twenty_eight = 0
+     if(this.checkedTwentyEight == true){
+        index_twenty_eight = 19
+      }else{
+        index_twenty_eight = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_twenty_eight == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+     
+     var index_twenty_night =0
+     if(this.checkedTwentyNight == true){
+        index_twenty_night = 20
+      }else{
+        index_twenty_night = -1
+      }
+      for(let i=0;i<this.goodTypeList.length;i++){
+        if(index_twenty_night == i){
+         arr.push(this.goodTypeList[i].id)
+        }
+      }
+      var params = {
+        ids:arr,
+      }
+      saveHisDialysis(params).then(response=>{
+        if(response.data.state == 1){
+           var msg = response.data.data.msg
+           this.startDialogVisibleOne = false
+        }
+      })
+    
     }
-    }
+   }
   }
 </script>
 

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

@@ -43,7 +43,11 @@
       </div>
       <div>
         <el-button size="small" icon="el-icon-printer" @click="toDialog" type="primary">设置</el-button>
+        <el-button size="small" icon="el-icon-printer" @click="toSign" type="primary">标签打印</el-button>
+        <el-button size="small" icon="el-icon-printer" @click="printAction" type="primary">标签打印设置</el-button>
+        
         <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">导出</el-button>
+        <el-button size="small" icon="el-icon-printer" @click="toPrint" type="primary">打印</el-button>
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
       </div>
     </div>
@@ -59,103 +63,110 @@
         }"
       >
         <el-table-column align="center"  type="selection" width="55">
-           <template slot-scope="scope">
-             
-           </template>
         </el-table-column>
         <el-table-column align="center" label="序号" width="55">
            <template slot-scope="scope">
              {{scope.$index + 1}}
            </template>
         </el-table-column>
-         <el-table-column align="center" label="透析机号" width="55">
+         <el-table-column align="center" label="透析机号"  v-if="dialysisSett.device_number==1">
            <template slot-scope="scope">
-              {{scope.row.device_number.number}}
+             {{scope.row.device_number.zone.name}}  {{scope.row.device_number.number}}
            </template>
         </el-table-column>
-        <el-table-column align="center" label="姓名" width="55">
+        <el-table-column align="center" label="姓名" v-if="dialysisSett.name==1">
            <template slot-scope="scope">
             {{scope.row.patient.name}}
            </template>
         </el-table-column>
-        <el-table-column align="center" label="住院(门诊)号" width="55">
+        <el-table-column align="center" label="透析号" v-if="dialysisSett.dialysis_no==1">
            <template slot-scope="scope">
-
+            {{scope.row.patient.dialysis_no}}
            </template>
         </el-table-column>
-        <el-table-column align="center" label="透前体重" width="55">
+        <el-table-column align="center" label="住院(门诊)号"  v-if="dialysisSett.admission_number==1">
+           <template slot-scope="scope">
+             {{scope.row.xt_receive_treatment_asses.admission_number}}
+           </template>
+        </el-table-column>
+        <el-table-column align="center" label="透前体重"  v-if="dialysisSett.weight_befor==1">
            <template slot-scope="scope">
              {{scope.row.assessment_befor_dislysis.weight_before}}
            </template>
         </el-table-column>
-         <el-table-column align="center" label="干体重" width="55">
+         <el-table-column align="center" label="干体重" v-if="dialysisSett.dry_weight==1">
            <template slot-scope="scope">
             {{scope.row.assessment_befor_dislysis.dry_weight}}
            </template>
         </el-table-column>
-         <el-table-column align="center" label="透前血压" width="55">
+         <el-table-column align="center" label="透前血压"  v-if="dialysisSett.blood_pressure==1">
            <template slot-scope="scope">
             <span v-if="scope.row.assessment_befor_dislysis.systolic_blood_pressure>0">{{scope.row.assessment_befor_dislysis.systolic_blood_pressure}}</span>
             <span v-if="scope.row.assessment_befor_dislysis.diastolic_blood_pressure>0">/{{scope.row.assessment_befor_dislysis.diastolic_blood_pressure}}</span> 
            </template>
         </el-table-column>
-         <el-table-column align="center" label="目标脱水量" width="55">
+         <el-table-column align="center" label="目标脱水量"  v-if="dialysisSett.ultrafiltration_volume==1">
            <template slot-scope="scope">
              <span v-if="scope.row.dialysis_prescription.target_ultrafiltration>0">{{scope.row.dialysis_prescription.target_ultrafiltration}}</span>
            </template>
         </el-table-column>
-        <el-table-column align="center" label="超率总量" width="55">
-           <template slot-scope="scope">
-
-           </template>
-        </el-table-column>
-        <el-table-column align="center" label="抗凝剂(首剂)(维持)(总量)" width="100">
+        <el-table-column align="center" label="抗凝剂(首剂)(维持)(总量)"  v-if="dialysisSett.anticoagulant==1">
            <template slot-scope="scope">
              <span>{{getAnticoagualnt(scope.row.dialysis_prescription.anticoagulant)}}</span>
              <span>{{getAnticoagualnt(scope.row.dialysis_prescription.anticoagulant)}}</span>
              <span>{{getAnticoagualnt(scope.row.dialysis_prescription.anticoagulant)}}</span>
-             <span v-if="scope.row.dialysis_prescription.anticoagulant_shouji > 0">(scope.row.dialysis_prescription.anticoagulant_shouji)</span>
-             <span v-if="scope.row.dialysis_prescription.anticoagulant_weichi > 0">(scope.row.dialysis_prescription.anticoagulant_weichi)</span>
-             <span v-if="scope.row.dialysis_prescription.anticoagulant_zongliang > 0">(scope.row.dialysis_prescription.anticoagulant_zongliang)</span>
+             <span v-if="scope.row.dialysis_prescription.anticoagulant_shouji > 0">({{scope.row.dialysis_prescription.anticoagulant_shouji}})</span>
+             <span v-if="scope.row.dialysis_prescription.anticoagulant_weichi > 0">({{scope.row.dialysis_prescription.anticoagulant_weichi}})</span>
+             <span v-if="scope.row.dialysis_prescription.anticoagulant_zongliang > 0">({{scope.row.dialysis_prescription.anticoagulant_zongliang}})</span>
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="透析时长" width="100">
+        <el-table-column align="center" label="透析时长" v-if="dialysisSett.dialysis_time ==1">
            <template slot-scope="scope">
-             <span v-if="scope.row.dialysis_duration >0">{{scope.row.dialysis_duration}}</span>
+             <span v-if="scope.row.dialysis_duration_hour >0">{{scope.row.dialysis_duration_hour}}时</span>
+             <span v-if="scope.row.dialysis_duration_minute >0">{{scope.row.dialysis_duration_minute}}分</span>
            </template>
         </el-table-column>
 
-       <el-table-column align="center" label="设备型号" width="100">
+       <el-table-column align="center" label="设备型号"  v-if="dialysisSett.device_type==1">
            <template slot-scope="scope">
-             <span></span>
+             <span>{{scope.row.assessment_befor_dislysis.machine_type}}</span>
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="透析器/灌流器" width="100">
+        <el-table-column align="center" label="透析器/灌流器"  v-if="dialysisSett.dialyzer_perfusion_apparatus == 1">
            <template slot-scope="scope">
              <span>{{scope.row.dialysis_prescription.dialyzer_perfusion_apparatus}}</span>
+           </template>
+        </el-table-column>
+
+        <el-table-column align="center" label="透析器"  v-if="dialysisSett.dialysis_dialyszers == 1">
+           <template slot-scope="scope">
              <span>{{scope.row.dialysis_prescription.dialysis_dialyszers}}</span>
+           </template>
+        </el-table-column>
+
+         <el-table-column align="center" label="灌流器"  v-if="dialysisSett.dialysis_irrigation ==1">
+           <template slot-scope="scope">
              <span>{{scope.row.dialysis_prescription.dialysis_irrigation}}</span>
            </template>
         </el-table-column>
 
-       
 
-        <el-table-column align="center" label="置换总量" width="100">
+        <el-table-column align="center" label="置换总量" v-if="dialysisSett.displace_liqui_value==1">
            <template slot-scope="scope">
              <span>{{scope.row.dialysis_prescription.replacement_total}}</span>
            </template>
         </el-table-column>
        
 
-        <el-table-column align="center" label="钾" width="100">
+        <el-table-column align="center" label="钾"  v-if="dialysisSett.kalium==1">
            <template slot-scope="scope">
              <span>{{scope.row.dialysis_prescription.kalium}}</span>
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="钠" width="100">
+        <el-table-column align="center" label="钠" v-if="dialysisSett.sodium==1">
            <template slot-scope="scope">
              <span>{{scope.row.dialysis_prescription.sodium}}</span>
            </template>
@@ -163,31 +174,31 @@
 
 
 
-        <el-table-column align="center" label="钙" width="100">
+        <el-table-column align="center" label="钙" v-if="dialysisSett.calcium==1">
            <template slot-scope="scope">
              <span>{{scope.row.dialysis_prescription.calcium}}</span>
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="碳酸氢盐" width="100">
+        <el-table-column align="center" label="碳酸氢盐"  v-if="dialysisSett.bicarbonate == 1">
            <template slot-scope="scope">
               <span>{{scope.row.dialysis_prescription.bicarbonate}}</span>
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="血管通路" width="100">
+        <el-table-column align="center" label="血管通路" v-if="dialysisSett.blood_access==1">
            <template slot-scope="scope">
              <span>{{getBloodAccessOption(scope.row.dialysis_prescription.blood_access)}}</span>
            </template>
         </el-table-column>
 
-       <el-table-column align="center" label="封管液" width="100">
+       <el-table-column align="center" label="封管液" v-if="dialysisSett.sealing_fluid_dispose == 1">
            <template slot-scope="scope">
-             
+             {{scope.row.xt_assesment_after_dislysis.sealing_fluid_dispose}}
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="葡萄糖" width="100">
+        <el-table-column align="center" label="葡萄糖"  v-if="dialysisSett.glucose==1">
            <template slot-scope="scope">
              {{scope.row.dialysis_prescription.amylaceum}}
            </template>
@@ -214,13 +225,19 @@
            <el-checkbox v-model="sealing_fluid_dispose" label="封管液"></el-checkbox>
            <el-checkbox v-model="mode_id" label="透析模式"></el-checkbox>
            <el-checkbox v-model="dialysis_time" label="透析时长"></el-checkbox>
+         
            <el-checkbox v-model="dialysis_dialyszers" label="透析器"></el-checkbox>
            <el-checkbox v-model="dialysis_irrigation" label="灌流器"></el-checkbox>
-           <el-checkbox v-model="gaijiliang" label="钙"></el-checkbox>
            <el-checkbox v-model="kalium" label="钾"></el-checkbox>
            <el-checkbox v-model="displace_liqui_value" label="置换总量"></el-checkbox>
            <el-checkbox v-model="bicarbonate" label="碳酸氢根"></el-checkbox>
            <el-checkbox v-model="glucose" label="葡萄糖"></el-checkbox>
+
+           <el-checkbox v-model="dialyzer_perfusion_apparatus" label="透析器/灌流器"></el-checkbox>
+           <el-checkbox v-model="displace_liqui_part" label="置换液"></el-checkbox>
+           <el-checkbox v-model="sodium" label="钠"></el-checkbox>
+           <el-checkbox v-model="calcium" label="钙"></el-checkbox>
+           <el-checkbox v-model="blood_access" label="血管通路"></el-checkbox>
         </span>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
@@ -228,6 +245,59 @@
        </span>
       </el-dialog>
 
+
+  <el-dialog
+    title="打印设置"
+    :visible.sync="dialogVisibleOne"
+    width="30%"
+    >
+     <span>
+       <ul>
+         <li>
+          <el-checkbox v-model="prescription_status">透析处方状态</el-checkbox>
+         </li>
+         <li>
+          <el-checkbox v-model="week">星期</el-checkbox>
+         </li>
+         <li>
+          <el-checkbox v-model="name">姓名</el-checkbox>
+         </li>
+         <li>
+          <el-checkbox v-model="zone_name">分区</el-checkbox>
+         </li>
+         <li>
+          <el-checkbox v-model="classes">班次</el-checkbox>
+         </li>
+         <li>
+          <el-checkbox v-model="number">机号</el-checkbox>
+         </li>
+         <li>
+          <el-checkbox v-model="mode">透析模式</el-checkbox>
+         </li>
+         <li>
+          <el-checkbox v-model="dialyzers">透析器</el-checkbox>
+         </li>
+         <li>
+          <el-checkbox v-model="perfusion_apparatus">灌流器</el-checkbox>
+         </li>
+         <li>
+          <el-checkbox v-model="anticoagulant">抗凝剂(商品名称)</el-checkbox>
+         </li>
+         <li>
+          <el-checkbox v-model="anticoagulant_zongliang">总量</el-checkbox>
+         </li>
+         <li>
+          <el-checkbox v-model="doctor_advice">长期医嘱</el-checkbox>
+         </li>
+       </ul>
+
+     </span>
+            <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisibleOne = false">取 消</el-button>
+      <el-button type="primary" @click="saveRemindPrint">保 存</el-button>
+     </span>
+    </el-dialog>
+
     </div>
 
     <el-pagination
@@ -316,6 +386,7 @@
 <script>
   import { GetAllZone,saveDialysisSetting,getDialysisSetting,getDialysisParameter,getDialysisParameterGoodList } from '@/api/dialysis'
   import { uParseTime } from "@/utils/tools";
+  import {getRemindPrintList,saveRemindPrint} from '@/api/schedule'
   import { getDataConfig } from '@/utils/data'
   import store from "@/store";
   export default {
@@ -392,11 +463,32 @@
         displace_liqui_value:false,
         bicarbonate:false,
         glucose:false,
+        dialyzer_perfusion_apparatus:false,
+        sodium:false,
+        calcium:false,
+        blood_access:false,
+        displace_liqui_part:false,
         blood_access_option:[],
         startdialogVisible:false,
-        schedule_type:"",
-        partion_type:"",
+
+        schedule_type:0,
+        partion_type:0,
         tableList:[],
+        dialysisSett:{},
+
+        dialogVisibleOne: false,
+        prescription_status: false,
+        week: false,
+        name: false,
+        zone_name: false,
+        classes: false,
+        number: false,
+        mode: false,
+        dialyzers: false,
+        perfusion_apparatus: false,
+        anticoagulant: false,
+        anticoagulant_zongliang: false,
+        doctor_advice: false,
       }
     },
     created() {
@@ -444,6 +536,8 @@
               var list = response.data.data.list
               this.list = list
               this.total = response.data.data.total
+              this.dialysisSett = response.data.data.dialysisSett
+              console.log("设置",this.dialysisSett)
             }
         }) 
       },
@@ -537,6 +631,20 @@
             this.startdialogVisible = true
             var list = response.data.data.list
             console.log("list232323223222wid",list)
+            var total = 0
+            var total_one = 0
+            var total_two = 0
+            var total_three = 0
+            var total_four = 0
+            var total_five = 0
+            var total_six = 0
+            var total_seven =0
+            var total_eight = 0
+            var total_night =0
+            var total_ten = 0
+            var total_elven = 0
+            var total_twenty = 0
+          
             if(list!=null && list.length>0){
               for(let i=0;i<list.length;i++){
                  list[i].dialysis_dialyszers_arr = []
@@ -551,6 +659,45 @@
                  if(list[i].dialysis_prescription.dialysis_irrigation!=""){
                    list[i].dialysis_irrigation_arr = list[i].dialysis_prescription.dialysis_irrigation.split(",")
                  }
+                 if(list[i].dialysis_prescription.anticoagulant == 1){
+                     total += list[i].dialysis_prescription.anticoagulant_zongliang 
+                 }
+                 if(list[i].dialysis_prescription.anticoagulant == 2){
+                     total_one += list[i].dialysis_prescription.anticoagulant_zongliang 
+                 }
+                if(list[i].dialysis_prescription.anticoagulant == 3){
+                     total_two += list[i].dialysis_prescription.anticoagulant_zongliang 
+                 }
+                 if(list[i].dialysis_prescription.anticoagulant == 4){
+                     total_three += list[i].dialysis_prescription.anticoagulant_zongliang 
+                 }
+                if(list[i].dialysis_prescription.anticoagulant == 5){
+                     total_four += list[i].dialysis_prescription.anticoagulant_zongliang 
+                 }
+                  if(list[i].dialysis_prescription.anticoagulant == 6){
+                     total_five += list[i].dialysis_prescription.anticoagulant_zongliang 
+                 }
+                  if(list[i].dialysis_prescription.anticoagulant == 7){
+                     total_six += list[i].dialysis_prescription.anticoagulant_zongliang 
+                 }
+                  if(list[i].dialysis_prescription.anticoagulant == 8){
+                     total_seven += list[i].dialysis_prescription.anticoagulant_zongliang 
+                 }
+                 if(list[i].dialysis_prescription.anticoagulant == 9){
+                     total_eight += list[i].dialysis_prescription.anticoagulant_zongliang 
+                 }
+                  if(list[i].dialysis_prescription.anticoagulant == 10){
+                     total_night += list[i].dialysis_prescription.anticoagulant_zongliang 
+                 }
+                  if(list[i].dialysis_prescription.anticoagulant == 11){
+                     total_ten+= list[i].dialysis_prescription.anticoagulant_zongliang 
+                 }
+                  if(list[i].dialysis_prescription.anticoagulant == 12){
+                     total_elven+= list[i].dialysis_prescription.anticoagulant_zongliang 
+                 }
+                   if(list[i].dialysis_prescription.anticoagulant == 13){
+                     total_twenty+= list[i].dialysis_prescription.anticoagulant_zongliang 
+                 }
               }
             }
             var dialysisDialyszersArr = []
@@ -626,7 +773,82 @@
               Arr.push(a);
             }
             console.log("newa",Arr)
-            this.tableList = Arr
+           console.log("total_one",total_one)
+           var  objArr = {name:"抗凝剂",specification_name:"无肝素",count:0}
+           objArr.count = total
+           var objArrOne = {name:"抗凝剂",specification_name:"普通肝素",count:0}
+            objArrOne.count = total_one
+           var objArrTwo = {name:"抗凝剂",specification_name:"低分子肝素",count:0}
+            objArrTwo.count = total_two
+           var objArrThree = {name:"抗凝剂",specification_name:"阿加曲班",count:0}
+            objArrThree.count = total_three
+           var objArrFour = {name:"抗凝剂",specification_name:"枸橼酸钠",count:0}
+            objArrFour.count = total_four
+           var objArrFive = {name:"抗凝剂",specification_name:"低分子肝素钙",count:0}
+            objArrFive.count = total_five
+           var objArrSix = {name:"抗凝剂",specification_name:"低分子肝素钠",count:0}
+            objArrSix.count = total_six
+           var objArrSeven = {name:"抗凝剂",specification_name:"依诺肝素",count:0}
+            objArrSeven.count = total_seven
+           var objArrEight = {name:"抗凝剂",specification_name:"达肝素",count:0}
+            objArrSeven.count = total_eight
+           var objArrNight = {name:"抗凝剂",specification_name:"体外抗凝",count:0}
+            objArrNight.count = total_eight
+           var objArrTen = {name:"抗凝剂",specification_name:"那屈肝素",count:0}
+            objArrTen.count = total_ten
+           var objArrEleven = {name:"抗凝剂",specification_name:"无抗凝剂",count:0}
+            objArrEleven.count = total_elven
+           var objArrTwenty = {name:"抗凝剂",specification_name:"那屈肝素钙",count:0}
+            objArrTwenty.count = total_twenty
+             console.log("objArrOne",objArrOne.count)
+              if(parseInt(objArr.count) > 0){
+                this.tableList.push(objArr)
+              }
+              console.log("objArrOne",parseInt(objArrOne.count))
+             if(parseInt(objArrOne.count) > 0){
+                console.log("j你了了呃呃呃呃呃呃")
+                this.tableList.push(objArrOne)
+              }
+              if(parseInt(objArrTwo).count > 0){
+                this.tableList.push(objArrTwo)
+              }
+               if(parseInt(objArrThree).count > 0){
+                this.tableList.push(objArrThree)
+              }
+               if(parseInt(objArrFour.count) > 0){
+                this.tableList.push(objArrFour)
+              }
+               if(parseInt(objArrFive.count) > 0){
+                this.tableList.push(objArrFive)
+              }
+               if(parseInt(objArrSix.count) > 0){
+                this.tableList.push(objArrSix)
+              }
+               if(parseInt(objArrSeven.count) > 0){
+                this.tableList.push(objArrSeven)
+              }
+               if(parseInt(objArrEight.count) > 0){
+                this.tableList.push(objArrEight)
+              }
+               if(parseInt(objArrNight.count) > 0){
+                this.tableList.push(objArrNight)
+              }
+               if(parseInt(objArrTen.count) > 0){
+                this.tableList.push(objArrTen)
+              }
+               if(parseInt(objArrEleven.count) > 0){
+                this.tableList.push(objArrEleven)
+              }
+               if(parseInt(objArrTwenty).count > 0){
+                this.tableList.push(objArrTwenty)
+              }
+              
+            
+            if(Arr.length >0){
+              for(let i=0;i<Arr.length;i++){
+                 this.tableList.push(Arr[i])
+              }
+            }
            }
         })
       },
@@ -789,6 +1011,31 @@
             }else{
               this.glucose = false
             }
+            if(dialysisSett.sodium == 1){
+               this.sodium = true
+            }else{
+              this.sodium = false
+            }
+            if(dialysisSett.calcium == 1){
+              this.calcium = true
+            }else{
+              this.calcium = false
+            }
+            if(dialysisSett.blood_access == 1){
+              this.blood_access = true
+            }else{
+              this.blood_access = false
+            }
+            if(dialysisSett.dialyzer_perfusion_apparatus == 1){
+               this.dialyzer_perfusion_apparatus = true
+            }else{
+              this.dialyzer_perfusion_apparatus = false
+            }
+            if(dialysisSett.displace_liqui_part == 1){
+              this.displace_liqui_part = true
+            }else{
+              this.displace_liqui_part = false
+            }
           }
      
         }
@@ -818,6 +1065,49 @@
        var displace_liqui_value_set =0
        var bicarbonate_set =0
        var glucose_set = 0
+       var sodium_set = 0
+       var calcium_set =0
+       var blood_access_set =0
+       var dialyzer_perfusion_apparatus_set =0
+       var displace_liqui_part_set =0
+       
+       if(this.sodium == false){
+         sodium_set = 2
+       }
+       if(this.sodium == true){
+         sodium_set = 1
+       }
+
+       if(this.calcium ==false){
+         calcium_set = 2
+       }
+       if(this.calcium == true){
+          calcium_set = 1
+       }
+
+      if(this.blood_access ==false){
+         blood_access_set = 2
+       }
+       if(this.blood_access == true){
+          blood_access_set = 1
+       }
+
+       if(this.dialyzer_perfusion_apparatus == false){
+         dialyzer_perfusion_apparatus_set = 2
+       }
+       if(this.dialyzer_perfusion_apparatus == true){
+         dialyzer_perfusion_apparatus_set =1
+       }
+
+       if(this.displace_liqui_part == false){
+          displace_liqui_part_set = 2
+       }
+       
+       if(this.displace_liqui_part == true){
+          displace_liqui_part_set = 1
+       }
+    
+
        if(this.device_number == false){
           device_number_set = 2
         }
@@ -973,6 +1263,11 @@
           displace_liqui_value_set:displace_liqui_value_set,
           bicarbonate_set:bicarbonate_set,
           glucose_set:glucose_set,
+          sodium_set:sodium_set,
+          calcium_set:calcium_set,
+          blood_access_set:blood_access_set,
+          dialyzer_perfusion_apparatus_set:dialyzer_perfusion_apparatus_set,
+          displace_liqui_part_set:displace_liqui_part_set,
         }
         console.log("patam223232332",params)
        saveDialysisSetting(params).then(response=>{
@@ -980,6 +1275,7 @@
            var dialysisSetting = response.data.data.dialysisSetting
            this.$message.success("保存成功!")
            this.dialogVisible = false
+           this.getlist()
          }
        })
      },
@@ -1034,7 +1330,204 @@
          }
        }
        return name
-     }
+     },
+     toSign(){
+       this.$router.push({path: '/dialysis/consumable/dialysis/print?schedule_type='+this.query.schedule_type+"&partion_id="+this.query.partition_id+"&schedule_date="+this.query.schedule_date+"&keyword="+this.query.keywords+"&page="+this.query.page+"&limit="+this.query.limit})
+     },
+     printAction(){
+      this.getRemindPrintList()
+      this.dialogVisibleOne = true
+
+     },
+    getRemindPrintList() {
+        getRemindPrintList().then(response => {
+          if (response.data.state == 1) {
+            var list = response.data.data.list
+            console.log('list222332', list)
+            if (list.anticoagulant == 1) {
+              console.log('进来22222')
+              this.anticoagulant = true
+            }
+            if (list.anticoagulant == 2) {
+              this.anticoagulant = false
+            }
+            if (list.anticoagulant_zongliang == 1) {
+              this.anticoagulant_zongliang = true
+            }
+            if (list.anticoagulant_zongliang == 2) {
+              this.anticoagulant_zongliang = false
+            }
+            if (list.classes == 1) {
+              this.classes = true
+            }
+            if (list.classes == 2) {
+              this.classes = false
+            }
+            if (list.dialyzers == 1) {
+              this.dialyzers = true
+            }
+            if (list.dialyzers == 2) {
+              this.dialyzers = false
+            }
+            if (list.doctor_advice == 1) {
+              this.doctor_advice = true
+            }
+            if (list.doctor_advice == 2) {
+              this.doctor_advice = false
+            }
+            if (list.name == 1) {
+              this.name = true
+            }
+            if (list.name == 2) {
+              this.name = false
+            }
+            if (list.number == 1) {
+              this.number = true
+            }
+            if (list.number == 2) {
+              this.number = false
+            }
+            if (list.perfusion_apparatus == 1) {
+              this.perfusion_apparatus = true
+            }
+            if (list.perfusion_apparatus == 2) {
+              this.perfusion_apparatus = false
+            }
+            if (list.prescription_status == 1) {
+              this.prescription_status = true
+            }
+            if (list.prescription_status == 2) {
+              this.prescription_status = false
+            }
+            if (list.week == 1) {
+              this.week = true
+            }
+            if (list.week == 2) {
+              this.week = false
+            }
+            if (list.zone == 1) {
+              this.zone_name = true
+            }
+            if (list.zone == 2) {
+              this.zone_name = false
+            }
+            if (list.mode == 1) {
+              this.mode = true
+            }
+            if (list.mode == 2) {
+              this.mode = false
+            }
+            this.form.id = list.id
+          }
+        })
+      },
+    
+      saveRemindPrint() {
+       
+
+        if (this.perfusion_apparatus == true) {
+          console.log('3333')
+          this.form.perfusion_apparatus = 1
+        }
+        if (this.perfusion_apparatus == false) {
+          this.form.perfusion_apparatus = 2
+        }
+        if (this.prescription_status == true) {
+          this.form.prescription_status = 1
+        }
+        if (this.prescription_status == false) {
+          this.form.prescription_status = 2
+        }
+        if (this.week == true) {
+          this.form.week = 1
+        }
+        if (this.week == false) {
+          this.form.week = 2
+        }
+        if (this.name == true) {
+          this.form.name = 1
+        }
+        if (this.name == false) {
+          this.form.name = 2
+        }
+        if (this.zone_name == true) {
+          this.form.zone = 1
+        }
+        if (this.zone_name == false) {
+          this.form.zone = 2
+        }
+        if (this.classes == true) {
+          this.form.classes = 1
+        }
+        if (this.classes == false) {
+          this.form.classes = 2
+        }
+        if (this.number == true) {
+          this.form.number = 1
+        }
+        if (this.number == false) {
+          this.form.number = 2
+        }
+        if (this.mode == true) {
+          this.form.mode = 1
+        }
+        if (this.mode == false) {
+          this.form.mode = 2
+        }
+        if (this.dialyzers == true) {
+          this.form.dialyzers = 1
+        }
+        if (this.dialyzers == false) {
+          this.form.dialyzers = 2
+        }
+
+        if (this.anticoagulant == true) {
+          this.form.anticoagulant = 1
+        }
+        if (this.anticoagulant == false) {
+          this.form.anticoagulant = 2
+        }
+        if (this.anticoagulant_zongliang == true) {
+          this.form.anticoagulant_zongliang = 1
+        }
+        if (this.anticoagulant_zongliang == false) {
+          this.form.anticoagulant_zongliang = 2
+        }
+        if (this.doctor_advice == true) {
+          this.form.doctor_advice = 1
+        }
+        if (this.doctor_advice == false) {
+          this.form.doctor_advice = 2
+        }
+        console.log('555555555', this.form.prescription_status)
+        var params = {
+          id: this.form.id,
+          prescription_status: this.form.prescription_status,
+          week: this.form.week,
+          name: this.form.name,
+          zone: this.form.zone,
+          classes: this.form.classes,
+          number: this.form.number,
+          mode: this.form.mode,
+          dialyzers: this.form.dialyzers,
+          perfusion_apparatus: this.form.perfusion_apparatus,
+          anticoagulant: this.form.anticoagulant,
+          anticoagulant_zongliang: this.form.anticoagulant_zongliang,
+          doctor_advice: this.form.doctor_advice
+        }
+        console.log('params', params)
+        saveRemindPrint(params).then(response => {
+          if (response.data.state == 1) {
+            var settting = response.data.data.setting
+            this.$message.success('保存成功')
+            this.dialogVisibleOne = false
+            this.getRemindPrintList()
+          }
+        })
+      },
+      toPrint(){
+        this.$router.push({path: '/dialysis/consumable/dialysis/parameter/print?schedule_type='+this.query.schedule_type+"&partion_id="+this.query.partition_id+"&schedule_date="+this.query.schedule_date+"&keyword="+this.query.keywords+"&page="+this.query.page+"&limit="+this.query.limit})
+      }
     }
   }
 </script>

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

@@ -26,6 +26,12 @@
             <el-option v-for="(admin, index) in adminRoles" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
+        
+        <el-form-item label="质控护士"  v-if="isShowFiled('质控护士')">
+          <el-select v-model="form.quality_nurse_id" placeholder="请选择质控护士">
+            <el-option v-for="(admin, index) in adminRoles" :key="index" :value="admin.id" :label="admin.name"></el-option>
+          </el-select>
+        </el-form-item>
 
         <el-form-item label="换药护士"  v-if="isShowFiled('换药护士')">
           <el-select v-model="form.change_nurse" placeholder="换药护士">
@@ -53,6 +59,8 @@
         </el-form-item>
 
 
+
+
         <el-form-item label="引血(ml/min)" v-if="isShowFiled('引血')">
           <el-input type="number" v-model="form.blood_drawing" style="width:200px;"></el-input>
         </el-form-item>
@@ -114,6 +122,7 @@
           change_nurse:"",
           difficult_puncture_nurse:"",
           new_fistula_nurse:"",
+          quality_nurse_id:"",
         },
         schedual_type: 0,
         schedules_type: [
@@ -195,7 +204,7 @@
         this.form.change_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.change_nurse
         this.form.difficult_puncture_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id:this.dialysis_order.difficult_puncture_nurse
         this.form.new_fistula_nurse = this.dialysis_order.id ==0?this.$store.getters.xt_user.user.id:this.dialysis_order.new_fistula_nurse
-
+        this.form.quality_nurse_id = this.dialysis_order.id == 0?this.$store.getters.xt_user.user.id:this.dialysis_order.quality_nurse_id
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1
@@ -372,7 +381,8 @@
         this.loading = true
         let mode = '1'
         var blood_drawing =  this.form.blood_drawing.toString()
-        startDialysis(this.patient_id, this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse,blood_drawing).then(rs => {
+        console.log("质控护士",this.form.quality_nurse_id)
+        startDialysis(this.patient_id, this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse,blood_drawing,this.form.quality_nurse_id).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {
@@ -407,6 +417,7 @@
         ParamsQuery['difficult_puncture_nurse'] = this.form.difficult_puncture_nurse
         ParamsQuery['new_fistula_nurse'] = this.form.new_fistula_nurse
         ParamsQuery["blood_drawing"] = this.form.blood_drawing
+        ParamsQuery["quality_nurse"] = this.form.quality_nurse_id
         ParamsQuery['mode'] = "2"
         if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {
           ParamsQuery['mode'] = "3"

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

@@ -82,7 +82,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395)">
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60)">
                         <el-form-item label="目标超滤量(ml)：">
                             <el-input
                                     type="number"
@@ -93,7 +93,7 @@
 
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395">
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60">
                         <el-form-item label="目标超滤量(L)：">
                             <el-input
                                     type="number"

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -39,6 +39,10 @@
           <label>新开瘘护士 : </label>
           <span class="content">{{ new_fistula_nurse }}</span>
         </li>
+        <li v-if="isShow('质控护士')">
+          <label>质控护士 : </label>
+          <span class="content">{{ quality_nurse_id }}</span>
+        </li>
         <li>
           <label>状态 : </label>
           <span class="content">{{ stage }}</span>
@@ -162,6 +166,12 @@
           return '-'
         }
         return this.admin_map[this.record.new_fistula_nurse] == null ? '' : this.admin_map[this.record.new_fistula_nurse].name
+      },
+      quality_nurse_id:function(){
+        if (this.record.id == 0) {
+          return '-'
+        }
+        return this.admin_map[this.record.quality_nurse_id] == null ? '' : this.admin_map[this.record.quality_nurse_id].name
       }
     },
     methods: {

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -587,15 +587,15 @@
               <label-box showValue="压疮" :isChecked="predialysis.skin == 8 ? true : false"></label-box>
               <label-box showValue="皮下淤血" :isChecked="predialysis.skin == 9 ? true : false"></label-box> -->
 
-              <label-box showValue="完整" :isChecked="predialysis.skin.indexOf('完整') >-1 ? true : false"></label-box>
-              <label-box showValue="干燥" :isChecked="predialysis.skin.indexOf('干燥') >-1? true : false"></label-box>
-              <label-box showValue="瘙痒" :isChecked="predialysis.skin.indexOf('瘙痒') >-1 ? true : false"></label-box>
-              <label-box showValue="菲薄" :isChecked="predialysis.skin.indexOf('菲薄') >-1 ? true : false"></label-box>/
-              <label-box showValue="水肿" :isChecked="predialysis.skin.indexOf('水肿') >-1? true : false"></label-box>
-              <label-box showValue="皮疹" :isChecked="predialysis.skin.indexOf('皮疹') >-1? true : false"></label-box>
-              <label-box showValue="出血点" :isChecked="predialysis.skin.indexOf('出血点') >-1 ? true : false"></label-box>
-              <label-box showValue="压疮" :isChecked="predialysis.skin.indexOf('压疮') >-1 ? true : false"></label-box>
-              <label-box showValue="皮下淤血" :isChecked="predialysis.skin.indexOf('皮下淤血') >-1 ? true : false"></label-box>
+              <label-box showValue="完整" :isChecked="predialysis.skin!=''&&predialysis.skin.indexOf('完整') >-1 ? true : false"></label-box>
+              <label-box showValue="干燥" :isChecked="predialysis.skin!=''&&predialysis.skin.indexOf('干燥') >-1? true : false"></label-box>
+              <label-box showValue="瘙痒" :isChecked="predialysis.skin!=''&&predialysis.skin.indexOf('瘙痒') >-1 ? true : false"></label-box>
+              <label-box showValue="菲薄" :isChecked="predialysis.skin!=''&&predialysis.skin.indexOf('菲薄') >-1 ? true : false"></label-box>/
+              <label-box showValue="水肿" :isChecked="predialysis.skin!=''&&predialysis.skin.indexOf('水肿') >-1? true : false"></label-box>
+              <label-box showValue="皮疹" :isChecked="predialysis.skin!=''&&predialysis.skin.indexOf('皮疹') >-1? true : false"></label-box>
+              <label-box showValue="出血点" :isChecked="predialysis.skin!=''&&predialysis.skin.indexOf('出血点') >-1 ? true : false"></label-box>
+              <label-box showValue="压疮" :isChecked="predialysis.skin!=''&&predialysis.skin.indexOf('压疮') >-1 ? true : false"></label-box>
+              <label-box showValue="皮下淤血" :isChecked="predialysis.skin!=''&&predialysis.skin.indexOf('皮下淤血') >-1 ? true : false"></label-box>
             </td>
           </tr>
           <tr>
@@ -1067,7 +1067,16 @@
               </span>
             </td>-->
             <td style="text-align:left;" colspan="6">
-              <span style="display:inline-block;margin-left:15px;">质控护士签名:</span>
+              <span style="display:inline-block;margin-left:15px;">质控护士签名:
+                <span v-if="setAdminUserES(dialysisOrder.quality_nurse_id) == ''">
+                    {{getAdminUser(dialysisOrder.quality_nurse_id)}}
+                </span>
+              <span
+                v-else style="align-items:center;justify-content:space-around;height:36px;"
+              >
+                <img style="height:30px;" :src="setAdminUserES(dialysisOrder.quality_nurse_id)" alt srcset />
+              </span>
+              </span>
             </td>
           </tr>
         </table>
@@ -1261,7 +1270,8 @@ export default {
       vascularAccess: [],
       nursing_record: '',
       special_record: '',
-      newTableAdvice: []
+      newTableAdvice: [],
+      qualityNurse:{}
     }
   },
   methods: {
@@ -1620,8 +1630,7 @@ export default {
           this.actual_treatment_hour = afterdialysis.actual_treatment_hour
           this.actual_treatment_minute = afterdialysis.actual_treatment_minute
           this.systolic_blood_pressure = afterdialysis.systolic_blood_pressure
-          this.diastolic_blood_pressure =
-            afterdialysis.diastolic_blood_pressure
+          this.diastolic_blood_pressure = afterdialysis.diastolic_blood_pressure
           this.afterdialysis = afterdialysis
           // eslint-disable-next-line no-unused-vars
           var doctoradvce = response.data.data.doctorAdvice
@@ -1834,7 +1843,7 @@ export default {
           // console.log('下机护士', finish_nurse)
           this.finshForm.url = finish_nurse.url
           this.finshForm.finish_nurse = finish_nurse.user_name
-
+        
           var doctorname = response.data.data.DoctorName
           // console.log('医师签名', doctorname)
           this.doctorForm.doctor = doctorname.user_name
@@ -1847,8 +1856,7 @@ export default {
           this.prescription_dewatering = dialysisway.prescription_dewatering
           this.blood_flow_volume = dialysisway.blood_flow_volume
           this.dialysate_flow = dialysisway.dialysate_flow
-          this.dialyzer_perfusion_apparatus =
-            dialysisway.dialyzer_perfusion_apparatus
+          this.dialyzer_perfusion_apparatus =dialysisway.dialyzer_perfusion_apparatus
           this.dialysate_formulation = dialysisway.dialysate_formulation
           this.blood_access = dialysisway.blood_access
           this.displace_liqui = dialysisway.displace_liqui

src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue

@@ -52,7 +52,7 @@
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
          <div>
-          <el-button  type="primary" @click="toOverCount">调试</el-button>
+          <!-- <el-button  type="primary" @click="toOverCount">调试</el-button> -->
            <el-button  type="primary" @click="toPrint">打印</el-button>
            <el-button  type="primary" @click="exportList">导出</el-button>
          </div>
@@ -198,7 +198,7 @@ export default {
      loading:false,
      pickerOptions:{ //禁用当前日期之前的日期
            disabledDate(v) {
-            return v.getTime() < 1667232000000
+            return v.getTime() < 1667491200000
           },
       },
     }
@@ -1016,7 +1016,7 @@ export default {
   },
    open(){
    
-    this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+    this.start_time = moment().year(2022).month(10).date(4).format('YYYY-MM-DD')
     this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
     this.houseList= []
     this.drugTypeList = []

src/xt_pages/stock/drugs/drugNewQuery.vue

@@ -10,13 +10,13 @@
               <DrugQuery></DrugQuery>
             </el-tab-pane>
           
-           <el-tab-pane label="进销存查询" name="second">
+           <!-- <el-tab-pane label="进销存查询" name="second">
               <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
-            </el-tab-pane> 
+            </el-tab-pane>  -->
 
-             <!-- <el-tab-pane label="进销存查询" name="five">
+             <el-tab-pane label="进销存查询" name="five">
                <PurchaseNewDrugQuery ref="mychildfive"></PurchaseNewDrugQuery>
-            </el-tab-pane> -->
+            </el-tab-pane>
         
             <el-tab-pane label="有效期查询" name="third">
                 <ExpiryDateDrugQuery ref="mychildOne"></ExpiryDateDrugQuery>

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -53,7 +53,7 @@
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
          <div>
-          <el-button type="primary" size="small" @click="toOverCount">调试</el-button>
+          <!-- <el-button type="primary" size="small" @click="toOverCount">调试</el-button> -->
            <el-button type="primary" size="small" @click="toPrint">打印</el-button>
            <el-button type="primary" size="small" @click="exportList">导出</el-button>
          </div>
@@ -202,7 +202,7 @@ export default {
      loading:false,
      pickerOptions:{ //禁用当前日期之前的日期
            disabledDate(v) {
-            return v.getTime() < 1667232000000
+            return v.getTime() < 1667491200000
           },
       },
     }
@@ -682,7 +682,7 @@ export default {
     }
    },
    open(){
-    this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+    this.start_time = moment().year(2022).month(10).date(4).format('YYYY-MM-DD')
     this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
     this.houseList = []
     this.goodTypeList= []

src/xt_pages/stock/stockNewQuery.vue

@@ -10,13 +10,13 @@
               <GoodNewQuery></GoodNewQuery>
             </el-tab-pane>
           
-            <el-tab-pane label="进销存查询" name="second">
+            <!-- <el-tab-pane label="进销存查询" name="second">
                <PurchaseStockQuery ref="mychild"></PurchaseStockQuery>
-            </el-tab-pane>
-<!-- 
+            </el-tab-pane> -->
+
              <el-tab-pane label="进销存查询" name="five">
                <PurchaseNewStockQuery ref="mychildfive"></PurchaseNewStockQuery>
-            </el-tab-pane> -->
+            </el-tab-pane>
          
             <el-tab-pane label="有效期查询" name="third">
                 <expiryDateQuery ref="mychildone"></expiryDateQuery>

src/xt_pages/workforce/components/tableWeeks.vue

@@ -309,11 +309,11 @@
             </el-table-column>
         </el-table>
 
-        <el-dialog
-                title="打印设置"
-                :visible.sync="dialogVisible"
-                width="30%"
-        >
+    <el-dialog
+            title="打印设置"
+            :visible.sync="dialogVisible"
+            width="30%"
+    >
      <span>
        <ul>
          <li>