Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 20220812

src/api/schedule_template/sch_template.js

@@ -125,3 +125,37 @@ export function BatchSmartSch(params,patient_id) {
     data: params
   })
 }
+
+
+
+
+export function updateEditSchedules(obj,delObj) {
+  var params = {
+    edit_schs: obj,
+    del_schs: delObj,
+
+  }
+  return request({
+    url: '/api/schedule/update_schtemplate',
+    method: 'post',
+    params: params,
+  })
+}
+
+
+export function getSmartSchByPatient(patient_id) {
+  console.log("patinet_id")
+  console.log(patient_id)
+
+  var params = {
+    "patient_id": patient_id,
+
+  }
+  return request({
+    url: '/api/smartsch/get',
+    method: 'get',
+    params: params,
+  })
+}
+
+

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

@@ -44,7 +44,7 @@
       </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="toClick" type="primary">脚本</el-button>
+<!--        <el-button size="small" icon="el-icon-printer" @click="toClick" type="primary">脚本</el-button>-->
         <el-button size="small" icon="el-icon-printer" @click="toPrint" type="primary">打印</el-button>
         <el-button size="small"  @click="exportListOne" type="primary" v-if="his_config.is_open == 1">导出</el-button>
         <el-button size="small" @click="exportList" type="primary" v-if="his_config.is_open != 1">导出</el-button>
@@ -52,7 +52,7 @@
         <el-button size="small" type="primary" v-if="his_config.is_open == 1" @click="toStatistics">统计表</el-button>
       </div>
     </div>
-   
+
     <div v-if="his_config.is_open != 1">
       <el-table
         @selection-change="handleSelectionChange"
@@ -84,13 +84,13 @@
             {{scope.row.patient.name}}
            </template>
         </el-table-column>
-       
+
         <el-table-column  align="center"  width="55" label="透析号">
            <template slot-scope="scope">
             {{scope.row.patient.dialysis_no}}
            </template>
         </el-table-column>
-        
+
         <el-table-column
           align="center"
           prop="name"
@@ -157,13 +157,13 @@
             {{scope.row.patient.name}}
            </template>
         </el-table-column>
-       
+
         <el-table-column  align="center"  width="55" label="透析号">
            <template slot-scope="scope">
             {{scope.row.patient.dialysis_no}}
            </template>
         </el-table-column>
-        
+
         <el-table-column
           align="center"
           prop="name"
@@ -177,7 +177,7 @@
 
         </el-table-column>
 
-      
+
 
       </el-table>
 
@@ -195,7 +195,7 @@
       </el-pagination>
     </div>
 
-    
+
     <el-dialog
       title="耗材统计表"
       :visible.sync="startDialogVisible"
@@ -223,7 +223,7 @@
 
          <el-button size="small" icon="el-icon-printer"  @click="toPrintOne" type="primary">打印</el-button>
          <el-button size="small"  @click="toExportListOne" type="primary">导出</el-button>
-        </div> 
+        </div>
        <el-table
         :data="tableList"
         border
@@ -248,14 +248,14 @@
              {{scope.row.specification_name}}
            </template>
         </el-table-column>
-       
+
         <el-table-column  align="center"   label="数量">
            <template slot-scope="scope">
              {{scope.row.count}}
            </template>
         </el-table-column>
-        
-     
+
+
 
       </el-table>
       </span>
@@ -272,29 +272,29 @@
       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 == 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 == 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>   
+          <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>
@@ -330,7 +330,7 @@
            </el-select>
            <el-button size="small" icon="el-icon-printer" @click="toHisPrint" type="primary">打印</el-button>
            <el-button size="small"  @click="toExportListTwo" type="primary">导出</el-button>
-        </div> 
+        </div>
        <el-table
         :data="tableList"
         border
@@ -355,14 +355,14 @@
              {{scope.row.specification_name}}
            </template>
         </el-table-column>
-       
+
         <el-table-column  align="center"   label="数量">
            <template slot-scope="scope">
              {{scope.row.count}}
            </template>
         </el-table-column>
-        
-     
+
+
 
       </el-table>
       </span>
@@ -383,7 +383,7 @@
   import { getDataConfig } from '@/utils/data'
   export default {
     components: {
-      
+
     },
     data() {
       return {
@@ -494,7 +494,7 @@
       this.query.page = 1
       this.query.ids = this.ids
       this.getAllZone()
-      this.dialysate_formulation =  getDataConfig(  
+      this.dialysate_formulation =  getDataConfig(
             'hemodialysis',
             'dialysate_formulation'
       )
@@ -512,24 +512,24 @@
       this.getlist()
     },
     methods: {
-    
+
       exportList(){
         import('@/vendor/Export2Excel').then(excel => {
-         
+
          var arr= []
-        
+
          arr.push('序号')
          arr.push('透析机号')
          arr.push('姓名')
          arr.push('透析号')
-       
+
         //  console.log("list23322323232",this.rowList)
          if(this.rowList!=null && this.rowList.length > 0){
            for(let i=0;i<this.rowList.length;i++){
              arr.push(this.rowList[i].filed_name_cn)
            }
          }
-        
+
          arr.push("备注")
         //  console.log("arr",arr)
 
@@ -540,7 +540,7 @@
         //  console.log("arrTwo",arrTwo)
          const tHeader = arr
         const filterVal = arrTwo
-        
+
         if(this.list!=null && this.list.length > 0){
           for(let i=0;i<this.list.length;i++){
             this.list[i].name0 = i+1
@@ -553,7 +553,7 @@
                 this.list[i]['name'+(this.rowList.length+4)] = this.list[i].dialysis_solution.remark
               }
             }
-         
+
           }
         }
         // console.log("list32232232323wi",this.list)
@@ -564,18 +564,18 @@
            filename: '透析耗材查询'
          })
           this.downloadLoading = false
-        }) 
+        })
       },
       exportListOne(){
         import('@/vendor/Export2Excel').then(excel => {
-         
+
          var arr= []
-        
+
          arr.push('序号')
          arr.push('透析机号')
          arr.push('姓名')
          arr.push('透析号')
-       
+
         //  console.log("list23322323232",this.typeList)
          if(this.typeList!=null && this.typeList.length > 0){
            for(let i=0;i<this.typeList.length;i++){
@@ -603,12 +603,12 @@
                 this.list[i]['name'+(j+4)] = this.getStr(this.list[i].typeList[j].id,this.list[i].projectList,this.list[i].patient_id)
               }
             }
-         
+
           }
         }
 
         console.log("list32232232323wi",this.list)
-      
+
         const data = this.formatJson(filterVal, this.list)
          excel.export_json_to_excel({
            header: tHeader,
@@ -616,7 +616,7 @@
            filename: '透析耗材查询'
          })
           this.downloadLoading = false
-        }) 
+        })
       },
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
@@ -642,7 +642,7 @@
         getPatientDialysisSolutionGroupList(this.query).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
-             
+
              var total = response.data.data.total
              this.total = total
              var goodType = response.data.data.goodType
@@ -672,7 +672,7 @@
                   list[i].typeList = []
                   list[i].typeList = this.typeList
                 }
-              
+
                  for(let i=0;i<list.length;i++){
                    if(list[i].his_prescription_template.his_prescription_info!=null && list[i].his_prescription_template.his_prescription_info.length >0){
                     for(let j=0;j<list[i].his_prescription_template.his_prescription_info.length;j++){
@@ -681,9 +681,9 @@
                      }
                    }
                    }
-                   
+
                  }
-                 this.list = list 
+                 this.list = list
                }
              }
            }
@@ -784,7 +784,7 @@
                  list[i].dialyzer_perfusion_apparatus_arr = []
                  list[i].dialysis_irrigation_arr = []
                  list[i].puncture_needle_arr = []
-                
+
                  if(list[i].dialysis_solution.dialysis_dialyszers!=""){
                    list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
                  }
@@ -797,11 +797,11 @@
                  if(list[i].dialysis_solution.puncture_needle!="" ){
                     list[i].puncture_needle_arr = list[i].dialysis_solution.puncture_needle.split(",")
                  }
-                 kaliumCount += parseInt(list[i].dialysis_solution.kalium) 
+                 kaliumCount += parseInt(list[i].dialysis_solution.kalium)
                  sodiumCount += parseInt(list[i].dialysis_solution.sodium)
                  calciumCount +=parseInt(list[i].dialysis_solution.calcium)
                  glucoseCount += parseInt(list[i].dialysis_solution.glucose)
-                  
+
                 if(list[i].dialysis_solution!=null &&list[i].dialysis_solution.kalium > 0){
                     list[i].dialysis_solution.specification = "钾" + list[i].dialysis_solution.kalium
                     kaliumArr.push(list[i].dialysis_solution)
@@ -821,7 +821,7 @@
                   list[i].dialysis_solution.specification_three = "葡萄糖" + list[i].dialysis_solution.amylaceum
                   glucoseArr.push(list[i].dialysis_solution)
                 }
-              
+
 
               }
             }
@@ -843,7 +843,7 @@
             })
             let newArr = Object.values(dataInfo)
 
-          
+
             for(let i=0;i<kaliumArr.length;i++){
               for(let j=0;j<newArr.length;j++){
                 if(kaliumArr[i].specification == newArr[j].specification){
@@ -855,7 +855,7 @@
             for(let i=0;i<newArr.length;i++){
                newArr[i].count = newArr[i].child.length
             }
-           
+
             console.log("newArr",newArr)
             for(let i=0;i<newArr.length;i++){
               this.tableList.push(newArr[i])
@@ -880,7 +880,7 @@
             })
             let newArr = Object.values(dataInfo)
 
-          
+
             for(let i=0;i<sodiumArr.length;i++){
               for(let j=0;j<newArr.length;j++){
                 if(sodiumArr[i].specification_one == newArr[j].specification_one){
@@ -891,16 +891,16 @@
 
             for(let i=0;i<newArr.length;i++){
              newArr[i].count += newArr[i].child.length
-              
+
             }
-           
+
             console.log("newArr",newArr)
             for(let i=0;i<newArr.length;i++){
               this.tableList.push(newArr[i])
             }
            }
 
-          
+
           if(calciumArr!=null && calciumArr.length > 0){
               let dataInfo = {}
               calciumArr.forEach((item, index) => {
@@ -917,7 +917,7 @@
             })
             let newArr = Object.values(dataInfo)
 
-          
+
             for(let i=0;i<calciumArr.length;i++){
               for(let j=0;j<newArr.length;j++){
                 if(calciumArr[i].specification_two == newArr[j].specification_two){
@@ -928,9 +928,9 @@
 
             for(let i=0;i<newArr.length;i++){
               newArr[i].count = newArr[i].child.length
-              
+
             }
-           
+
             console.log("newArr",newArr)
             for(let i=0;i<newArr.length;i++){
               this.tableList.push(newArr[i])
@@ -938,7 +938,7 @@
            }
 
 
-                
+
           if(glucoseArr!=null && glucoseArr.length > 0){
               let dataInfo = {}
               glucoseArr.forEach((item, index) => {
@@ -955,7 +955,7 @@
             })
             let newArr = Object.values(dataInfo)
 
-          
+
             for(let i=0;i<glucoseArr.length;i++){
               for(let j=0;j<newArr.length;j++){
                 if(glucoseArr[i].specification_three == newArr[j].specification_three){
@@ -966,9 +966,9 @@
 
             for(let i=0;i<newArr.length;i++){
              newArr[i].count += newArr[i].child.length
-              
+
             }
-           
+
             console.log("newArr",newArr)
             for(let i=0;i<newArr.length;i++){
               this.tableList.push(newArr[i])
@@ -979,12 +979,12 @@
             var dialyzerPerfusionApparaArr = []
             var dialysisIrrigationArr = []
             var punctureNeedleArr = []
-            
-          
+
+
             for(let i=0;i<list.length;i++){
              for(let j=0;j<list[i].dialysis_dialyszers_arr.length;j++){
-             
-               dialysisDialyszersArr.push(list[i].dialysis_dialyszers_arr[j])  
+
+               dialysisDialyszersArr.push(list[i].dialysis_dialyszers_arr[j])
              }
              for(let z=0;z<list[i].dialyzer_perfusion_apparatus_arr.length;z++){
               dialyzerPerfusionApparaArr.push(list[i].dialyzer_perfusion_apparatus_arr[z])
@@ -993,7 +993,7 @@
               dialysisIrrigationArr.push(list[i].dialysis_irrigation_arr[y])
              }
              for(let h=0;h<list[i].puncture_needle_arr.length;h++){
-               punctureNeedleArr.push(list[i].puncture_needle_arr[h])   
+               punctureNeedleArr.push(list[i].puncture_needle_arr[h])
              }
             }
            let obj = {}
@@ -1016,15 +1016,15 @@
               a.specification_name = i
               Arr.push(a);
             }
-          
+
            for(let i=0;i<dialyzerPerfusionApparaArr.length;i++){
             if(objOne[dialyzerPerfusionApparaArr[i]]){
                 objOne[dialyzerPerfusionApparaArr[i]] +=1
              }else{
               objOne[dialyzerPerfusionApparaArr[i]] = 1
-             }   
+             }
            }
-           
+
            for (let i in objOne) {
               let a = {};
               a[i] = objOne[i];
@@ -1039,7 +1039,7 @@
               objTwo[dialysisIrrigationArr[i]] +=1
              }else{
               objTwo[dialysisIrrigationArr[i]] = 1
-             }   
+             }
            }
 
            for (let i in objTwo) {
@@ -1050,7 +1050,7 @@
               a.specification_name = i
               Arr.push(a);
             }
-            
+
           for(let i = 0 ; i < punctureNeedleArr.length; i++){
             if(objThree[punctureNeedleArr[i]]){
                objThree[punctureNeedleArr[i]] +=1
@@ -1066,26 +1066,26 @@
               a.specification_name = i
               Arr.push(a);
             }
-            
-          
+
+
 
 
           //  var objfive = {name:"钾(mmol/L)",specification_name:"2.0",count:""}
           //  var objsix =  {name:"钠(mmol/L)",specification_name:"1.25",count:""}
           //  var objseven = {name:"钙(mmol/L)",specification_name:"1.5",count:""}
           //  var objeight = {name:"葡萄糖(mmol/L)",specification_name:"无糖",count:""}
-         
-           
+
+
             // objfive.count = kaliumCount
             // objsix.count = sodiumCount
             // objseven.count = calciumCount
             // objeight.count = glucoseCount
-            
+
             // this.tableList.push(objfive)
             // this.tableList.push(objsix)
             // this.tableList.push(objseven)
             // this.tableList.push(objeight)
-           
+
             for(let i=0;i<Arr.length;i++){
               for(let j=0;j<this.rowList.length;j++){
                 if(Arr[i].name == this.rowList[j].filed_name_cn){
@@ -1093,12 +1093,12 @@
                 }
               }
             }
-            
+
             console.log("tablistlist233323232",this.tableList)
-           
+
           }
        })
-        
+
       },
       toStatistics(){
         this.tableList = []
@@ -1123,14 +1123,14 @@
                 }
              }
             //  console.log("projectList",projectList)
-             
+
              if(projectList!=null && projectList.length > 0){
                for(let i=0;i<projectList.length;i++){
                  projectList[i].good_id = 0
                  projectList[i].good_id = projectList[i].good_info.id
                }
              }
-             
+
              let dataInfo = {}
               projectList.forEach((item, index) => {
               let { good_id } = item
@@ -1145,7 +1145,7 @@
               }
             })
             let newArr = Object.values(dataInfo)
-          
+
             for(let i=0;i<projectList.length;i++){
               for(let j=0;j<newArr.length;j++){
                  if(projectList[i].good_id == newArr[j].good_id){
@@ -1153,7 +1153,7 @@
                  }
               }
             }
-            
+
             for(let i=0;i<newArr.length;i++){
               for(let j=0;j<newArr[i].child.length;j++){
                  newArr[i].count += parseInt(newArr[i].child[j].count)
@@ -1186,7 +1186,7 @@
           }else{
            return ""
           }
-          
+
         }
         if(filed_name_cn == "目标超滤量"){
 
@@ -1250,14 +1250,14 @@
          return val.special_medicine_other
         }
         if(filed_name_cn == "置换液"){
-          return this.getDisplace(val.displace_liqui_part) 
+          return this.getDisplace(val.displace_liqui_part)
         }
         if(filed_name_cn == "血管通路"){
           return this.getBloodAccess(val.blood_access)
         }
         if(filed_name_cn == "体液过多其他症状"){
           return val.body_fluid_other
-        }  
+        }
         if(filed_name_cn == "透析时长"){
           return   val.dialysis_duration_hour + "小时" + val.dialysis_duration_minute + "分钟"
         }
@@ -1488,7 +1488,7 @@
       for(let i=0;i<this.displace_liqui_part_option.length;i++){
         if(id == this.displace_liqui_part_option[i].id){
            name = this.displace_liqui_part_option[i].name
-        } 
+        }
       }
       return name
     },
@@ -1582,13 +1582,13 @@
             if(i == 20 && this.goodTypeList[i].is_open == 1){
                this.checkedTwentyNight= true
             }
-           
+
           }
           this.startDialogVisibleOne = true
         }
-      }) 
+      })
     },
-    saveHisDialysis(){ 
+    saveHisDialysis(){
       var index = 0
       var arr = []
       if(this.checkedOne == true){
@@ -1601,7 +1601,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-      
+
      var index_one = 0
      if(this.checkedTwo == true){
         index_one = 1
@@ -1613,7 +1613,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-   
+
     var index_two = 0
     if(this.checkedThree == true){
         index_two = 2
@@ -1625,7 +1625,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-    
+
     var index_three = 0
      if(this.checkedFour == true){
         index_three = 3
@@ -1637,7 +1637,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-     
+
      var index_four = 0
       if(this.checkedFive == true){
         index_four = 4
@@ -1649,7 +1649,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-      
+
       var index_five = 0
       if(this.checkedSix == true){
         index_five = 5
@@ -1661,7 +1661,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-     
+
      var index_six = 0
      if(this.checkedSeven == true){
         index_six = 6
@@ -1673,7 +1673,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-     
+
      var index_seven = 0
       if(this.checkedEnight == true){
         index_seven = 7
@@ -1698,7 +1698,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-   
+
    var index_night = 0
     if(this.checkedTen == true){
         index_night = 9
@@ -1710,7 +1710,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-     
+
      var index_ten = 0
      if(this.checkedEleven == true){
         index_ten = 10
@@ -1722,7 +1722,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-     
+
      var index_eleven =0
      if(this.checkedTwenty == true){
         index_eleven = 11
@@ -1746,7 +1746,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-    
+
     var index_twenty_two = 0
      if(this.checkedTwentyTwo == true){
         index_twenty_two = 13
@@ -1758,7 +1758,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-    
+
      var index_twenty_three = 0
      if(this.checkedTwentyThree == true){
         index_twenty_three = 14
@@ -1770,7 +1770,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-     
+
      var index_twenty_four = 0
       if(this.checkedTwentyFour == true){
         index_twenty_four = 15
@@ -1782,7 +1782,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-     
+
      var index_twenty_five = 0
      if(this.checkedTwentyFive == true){
         index_twenty_five = 16
@@ -1794,7 +1794,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-     
+
      var index_twenty_six = 0
      if(this.checkedTwentySix == true){
         index_twenty_six = 17
@@ -1818,7 +1818,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-     
+
      var index_twenty_eight = 0
      if(this.checkedTwentyEight == true){
         index_twenty_eight = 19
@@ -1830,7 +1830,7 @@
          arr.push(this.goodTypeList[i].id)
         }
       }
-     
+
      var index_twenty_night =0
      if(this.checkedTwentyNight == true){
         index_twenty_night = 20
@@ -1855,10 +1855,10 @@
            this.getlist()
         }
       })
-    
+
     },
     getTypeName(val,patient_id){
-   
+
     var str = ""
     var arrNew = []
      if(val.project!=null){
@@ -1867,7 +1867,7 @@
         if(val.project!=null){
         for(let i=0;i<val.project.length;i++){
             arr.push(val.project[i])
-         }  
+         }
          for(let i=0;i<arr.length;i++){
            arr[i].good_type_id = 0
            arr[i].good_type_id = arr[i].good_info.good_type_id
@@ -1894,7 +1894,7 @@
             }
            }
          }
-       
+
          if(newArr!=null && newArr.length > 0){
           for(let i=0;i<newArr.length;i++){
            for(let j=0;j<newArr[i].child.length;j++){
@@ -1902,20 +1902,20 @@
            }
           }
          }
-         
+
           if(newArr!=null && newArr.length >0){
             for(let i=0;i<newArr.length;i++){
               arrNew.push(newArr[i])
             }
           }
-      
+
         }
       }
-     
+
       return arrNew
-     
+
      }
-   
+
     },
     getStr(good_type_id,arrNew,patient_id){
       // console.log("ARR233323",arrNew)
@@ -1932,7 +1932,7 @@
           }
         }
       }
-      
+
        let dataInfo = {}
        if(arr!=null && arr.length > 0){
         arr.forEach((item, index) => {
@@ -1955,7 +1955,7 @@
               }
             }
           }
-            
+
           if(newArr!=null && newArr.length > 0){
             for(let j=0;j<newArr.length;j++){
               for(let z=0;z<newArr[j].child.length;z++){
@@ -1967,7 +1967,7 @@
             }
           }
        }
-    
+
       return str
     },
     toPrint(){
@@ -1981,7 +1981,7 @@
     },
     toExportListOne(){
       import('@/vendor/Export2Excel').then(excel => {
-         
+
         if(this.tableList!=null && this.tableList.length > 0){
            for(let i=0;i<this.tableList.length;i++){
              this.tableList[i].index = i+1
@@ -1997,10 +1997,10 @@
            filename: '透析耗材统计'
          })
           this.downloadLoading = false
-        }) 
+        })
     },
     toExportListTwo(){
-      import('@/vendor/Export2Excel').then(excel => { 
+      import('@/vendor/Export2Excel').then(excel => {
         if(this.tableList!=null && this.tableList.length > 0){
            for(let i=0;i<this.tableList.length;i++){
              this.tableList[i].index = i+1
@@ -2016,7 +2016,7 @@
            filename: '透析耗材统计'
          })
           this.downloadLoading = false
-        })  
+        })
     },
     handleSelectionChange(val){
       var arr = []

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -180,7 +180,7 @@
                               <div>
 
                                 <el-button
-                                    v-if="(hisPatientInfo.id_card_type == 4 && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id != 10340)"
+                                    v-if="(hisPatientInfo.id_card_type == 4 && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0  && org_id != 10340)"
                                     size="small"
                                     @click="open(50,items.med_type,items.prescriptions[0].order,items.prescriptions)"
                                     type="primary"
@@ -203,8 +203,6 @@
                                 </el-button>
                                 <!--<div>{{ items.curPrescriptions.order.order_status}}</div>-->
                                 <!--<div>{{ items.prescriptions[0].order.order_status}}</div>-->
-
-
                                 <el-button v-loading="loadingtwo"
                                            v-if="((hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3) && org_id != 10340"
                                            size="small"
@@ -2980,7 +2978,7 @@ export default {
         }
 
         if (this.hisPatientInfo.id_card_type == 1) {
-          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191) {
+          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318) {
             this.pwdFormVisible = true
             this.pwd = ''
           } else {
@@ -2992,7 +2990,8 @@ export default {
 
           }
         } else {
-          if (this.activeName == 'first') {/////////////////////////押金shows
+          if (this.activeName == 'first') {
+            //押金shows
             this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
           } else {
             this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -55,13 +55,13 @@
          :balanceAccounts="balanceAccounts"
      >
      </printSeven>
-
-      <printOne :info="info" v-if="org_id != 9990 &&
-          org_id != 10138 &&
-          org_id != 9504 &&
-          org_id != 10028 &&
-          org_id != 4 &&
-          org_id != 10278 && org_id != 10191 && org_id != 10387"></printOne>
+   <printOne :info="info" v-else></printOne>
+<!--      <printOne :info="info" v-if="org_id != 9990 &&-->
+<!--          org_id != 10138 &&-->
+<!--          org_id != 9504 &&-->
+<!--          org_id != 10028 &&-->
+<!--          org_id != 4 &&-->
+<!--          org_id != 10278 && org_id != 10191 && org_id != 10387"></printOne>-->
       <!-- 测试医保环境下表格样式放开以下这条 -->
       <!-- <testVue :info="info" v-else></testVue> -->
     </div>

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

@@ -1129,6 +1129,9 @@ export default {
         totalthree +=arr3[i].count
       }
     }
+    console.log("totalone2332323",totalone)
+    console.log("totaltwo",totaltwo)
+    console.log("totalthr3eee",totalthree)
     total = totalone + totaltwo - totalthree
     if (total < min_number) {
       min_str = total + min_unit;

src/xt_pages/stock/stockOutOrder.vue

@@ -270,16 +270,27 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="仓库名称" align="center">
+          <!-- <el-table-column label="仓库名称" align="center">
             <template slot-scope="scope">
               {{ getHouseName(scope.row.storehouse_id) }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <!-- <el-table-column label="剩余库存" align="center" v-if="is_sys== 0">
             <template slot-scope="scope">
               <span>{{scope.row.stock_count}}</span>
             </template>
           </el-table-column> -->
+
+          <el-table-column label="出库数量" align="center">
+            <template slot-scope="scope">
+               <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                      {{ getHouseName(item.storehouse_id) }}
+                  </td>
+               </tr>
+             
+            </template>
+          </el-table-column>
        
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
@@ -2343,7 +2354,7 @@ export default {
     },
     // 合并单元格样式
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      let arr = [4,5,6,7,8,9,10,11,12,13];
+      let arr = [3,4,5,6,7,8,9,10,11,12,13];
       if (arr.indexOf(columnIndex) > -1) {
         return "spanClass";
       }

src/xt_pages/workforce/appointment.vue

@@ -356,290 +356,6 @@ export default {
           }
       )
 
-    },getWeekPanelsTwo() {
-      // this.scheduleZoneRow = []
-      // this.scheduleZone = []
-      getWeekPanels(1, this.partition_id).then(response => {
-        if (response.data.state == 0) {
-          return false
-        }
-        var partitions = response.data.data.partitions
-        // console.log("分区",partitions)
-        this.theWeek.thisWeek = response.data.data.theWeek
-        this.theWeek.lastWeek = response.data.data.theLastWeek
-        this.theWeek.nextWeek = response.data.data.theNextWeek
-        this.theWeek.nextTwoWeek = response.data.data.theNextSecWeek
-        // 在控制变量改变的时候进行 强制渲染更新
-        let childrenRefs = this.$refs.elTabs.$children
-        this.$nextTick(() => {
-          childrenRefs.forEach(child => child.$forceUpdate())
-        })
-
-        var that = this
-
-        if (partitions.length > 0) {
-          let arrSort = []
-          partitions.forEach((item) => {
-            let num = Math.max.apply(Math, item.jihaos.map(function (o) {
-              return o.sort
-            }))
-            item.sort = num
-            arrSort.push(item)
-          })
-          arrSort.sort(this.compare('sort'))
-          partitions = arrSort
-          partitions.forEach(function (partition) {
-            if (partition.jihaos.length == 0) {
-              return false
-            }
-            that.scheduleZoneRow.push(partition.jihaos.length)
-            that.partitions[partition.id] = partition
-            partition.jihaos.forEach(function (jihao) {
-              var thisPa = {
-                area: partition.name,
-                zone_id: partition.id,
-                zone_type: partition.type,
-                cut: jihao.number,
-                jihao_id: jihao.id,
-                Mon_M: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Mon_A: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Mon_N: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Tue_M: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Tue_A: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Tue_N: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Wed_M: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Wed_A: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Wed_N: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Thurs_M: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Thurs_A: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Thurs_N: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Fri_M: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Fri_A: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Fri_N: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Sat_M: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Sat_A: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Sat_N: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Sun_A: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  patient_id: 0,
-                  dialysis_machine_name:"",
-
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Sun_N: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                Sun_M: {
-                  schedule_id: 0,
-                  mode_id: 0,
-                  mode_name: '',
-                  dialysis_machine_name:"",
-
-                  patient_id: 0,
-                  patient: '',
-                  zone_id:partition.id,
-                  jihao_id: jihao.id,
-                },
-                total: 0
-              }
-              that.scheduleZone.push(thisPa)
-            })
-
-          })
-        }
-        this.export_file_step_two()
-      })
     },
     getWeekPanels() {
       // this.scheduleZoneRow = []
@@ -921,7 +637,10 @@ export default {
               that.scheduleZone.push(thisPa)
             })
           })
+
         }
+        console.log("111111111")
+        console.log(that.scheduleZone)
       })
     },changeSch(val){
       console.log(this.partitions)
@@ -3085,12 +2804,12 @@ export default {
 
     changePartition(val) {
       this.partition_id = val
-      this.getThreeWeekList()
-      this.getWeekPanels()
-    },
+      // this.getThreeWeekList()
+      // this.getWeekPanels()
+   },
 
     changeSchedule(val) {
-      this.schedule_type = val
+      this.schedule_type = vald
       this.getThreeWeekList()
       this.getWeekPanels()
     },
@@ -3307,8 +3026,8 @@ export default {
     }
     let newNum = 0
     for (let i = 0; i < this.weekList.length; i++) {
-      if (this.weekNum + i + 1 <= 53) {
-        let num = this.weekNum + i
+      if (this.weekNum + i +2 <= 53) {
+        let num = this.weekNum + i +1
         let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + num + ')'
         this.typeOptions.push({value: i, label: str})
         let stt = this.weekList[i][0] + "~" + this.weekList[i][6]

src/xt_pages/workforce/components/editTableData.vue

@@ -1633,7 +1633,7 @@
             :label="item.title"
             :name="item.name"
         >
-          <el-table border :data="item.tableWeekArrage" style="width: 100%">
+          <el-table v-loading="dataloading" border :data="item.tableWeekArrage" style="width: 100%">
             <!-- 自定义表结构 -->
             <el-table-column
                 label="星期"
@@ -1824,6 +1824,7 @@ const moment = require("moment");
 import {
   PostSearchSmartSchPatient,
   getSmartDevices,
+  getSmartSchByPatient
 } from "@/api/schedule_template/sch_template";
 
 import {
@@ -1903,6 +1904,8 @@ export default {
 
   data() {
     return {
+      dataloading:false,
+      current_patient_data:[],
       week_zhongwens: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
       week_type: "",
       saveloading: false,
@@ -1919,18 +1922,23 @@ export default {
           title: "本周",
           name: "1",
           tableWeekArrage: [],
+          weeks:[],
         },
         {
           checkedWeek: [],
           title: "下周",
           name: "2",
           tableWeekArrage: [],
+          weeks:[],
+
         },
         {
           checkedWeek: [],
           title: "下下周",
           name: "3",
           tableWeekArrage: [],
+          weeks:[],
+
         },
       ],
 
@@ -2344,7 +2352,9 @@ export default {
       this.smart_keyword = "";
     },
     batchSetSch() {
-      var tempData = [];
+      var saveOrEditTempData = [];
+      var delTempData = [];
+
       var day = new Date().getDay();
       if (day == 0) {
         day = 7;
@@ -2372,7 +2382,7 @@ export default {
             week_type: "1",
             week_name: this.editableTabs[0].tableWeekArrage[b].week,
           };
-          tempData.push(obj);
+          saveOrEditTempData.push(obj);
         }
       }
       for (let b = 0; b < this.editableTabs[1].tableWeekArrage.length; b++) {
@@ -2389,9 +2399,8 @@ export default {
           week_type: "2",
           week_name: this.editableTabs[1].tableWeekArrage[b].week,
         };
-        tempData.push(obj);
+        saveOrEditTempData.push(obj);
       }
-
       for (let b = 0; b < this.editableTabs[2].tableWeekArrage.length; b++) {
         let obj = {
           schedule_date: this.editableTabs[2].tableWeekArrage[b].schedule_date,
@@ -2406,21 +2415,100 @@ export default {
           week_type: "3",
           week_name: this.editableTabs[2].tableWeekArrage[b].week,
         };
-        tempData.push(obj);
+        saveOrEditTempData.push(obj);
       }
 
-      for (let i = 0; i < tempData.length; i++) {
-        if (tempData[i].bed_id == "" || tempData[i].zone_id == "") {
+      //原始数据，用来与智能排版的数据进行比对，查出有排班记录，取消勾选的数据，作为删除的数据，提交给后端
+
+      for (let b = 0; b < this.current_patient_data[0].tableWeekArrage.length; b++) {
+        //只有大于等于今天的数据才能保存和没有上机的
+        if (
+          this.getWeekByzhongwen(
+            this.current_patient_data[0].tableWeekArrage[b].week
+          ) >= day &&
+          this.current_patient_data[0].tableWeekArrage[b].is_edit
+        ) {
+          let obj = {
+            schedule_date:
+            this.current_patient_data[0].tableWeekArrage[b].schedule_date,
+            schedule_type: this.current_patient_data[0].tableWeekArrage[b].sch_type,
+            bed_id: this.current_patient_data[0].tableWeekArrage[b].jihao_id,
+            schedule_week: this.getWeekByzhongwen(
+              this.current_patient_data[0].tableWeekArrage[b].week
+            ),
+            mode_id: this.current_patient_data[0].tableWeekArrage[b].mode_id,
+            sch_id: this.current_patient_data[0].tableWeekArrage[b].sch_id,
+            zone_id: this.current_patient_data[0].tableWeekArrage[b].zone_id,
+            week_type: "1",
+            week_name: this.current_patient_data[0].tableWeekArrage[b].week,
+          };
+          delTempData.push(obj);
+        }
+      }
+      for (let b = 0; b < this.current_patient_data[1].tableWeekArrage.length; b++) {
+        let obj = {
+          schedule_date: this.current_patient_data[1].tableWeekArrage[b].schedule_date,
+          schedule_type: this.current_patient_data[1].tableWeekArrage[b].sch_type,
+          bed_id: this.current_patient_data[1].tableWeekArrage[b].jihao_id,
+          schedule_week: this.getWeekByzhongwen(
+            this.current_patient_data[1].tableWeekArrage[b].week
+          ),
+          mode_id: this.current_patient_data[1].tableWeekArrage[b].mode_id,
+          sch_id: this.current_patient_data[1].tableWeekArrage[b].sch_id,
+          zone_id: this.current_patient_data[1].tableWeekArrage[b].zone_id,
+          week_type: "2",
+          week_name: this.current_patient_data[1].tableWeekArrage[b].week,
+        };
+        delTempData.push(obj);
+      }
+      for (let b = 0; b < this.current_patient_data[2].tableWeekArrage.length; b++) {
+        let obj = {
+          schedule_date: this.current_patient_data[2].tableWeekArrage[b].schedule_date,
+          schedule_type: this.current_patient_data[2].tableWeekArrage[b].sch_type,
+          bed_id: this.current_patient_data[2].tableWeekArrage[b].jihao_id,
+          schedule_week: this.getWeekByzhongwen(
+            this.current_patient_data[2].tableWeekArrage[b].week
+          ),
+          mode_id: this.current_patient_data[2].tableWeekArrage[b].mode_id,
+          sch_id: this.current_patient_data[2].tableWeekArrage[b].sch_id,
+          zone_id: this.current_patient_data[2].tableWeekArrage[b].zone_id,
+          week_type: "3",
+          week_name: this.current_patient_data[2].tableWeekArrage[b].week,
+        };
+        delTempData.push(obj);
+      }
+
+
+
+      for (let i = 0; i < saveOrEditTempData.length; i++) {
+        if (saveOrEditTempData[i].bed_id == "" || saveOrEditTempData[i].zone_id == "") {
           this.$message.error("分区或者床位不能空");
           return;
         }
       }
+      console.log(saveOrEditTempData)
+      console.log(delTempData)
+
+
+      if (saveOrEditTempData.length > 0 ) {
+        // console.log("111111")
+
+        // for(let i = 0; i < delTempData.length; i++){
+        //   for(let b = 0; b < saveOrEditTempData.length; b++){
+        //     console.log(delTempData[i].sch_id)
+        //     console.log(saveOrEditTempData[b].sch_id)
+        //
+        //     if(delTempData[i].sch_id == saveOrEditTempData[b].sch_id){
+        //         console.log("被删元素"+delTempData[i])
+        //         delTempData.splice(i,1)
+        //       }
+        //   }
+        // }
 
-      if (tempData.length > 0) {
         let obj = {
-          smart_schs: tempData,
+          smart_schs: saveOrEditTempData,
+          del_schs:[],
         };
-        console.log(obj);
         this.saveloading = true;
         BatchSmartSch(obj, this.cur_smart_patient_id).then((response) => {
           if (response.data.state == 1) {
@@ -2489,137 +2577,165 @@ export default {
       return "";
     },
     handleSelect(val) {
-      this.editableTabsValue = "1";
-
-      this.editableTabs[0].tableWeekArrage = [];
-      this.editableTabs[1].tableWeekArrage = [];
-      this.editableTabs[2].tableWeekArrage = [];
+      this.dataloading = true
+      getSmartSchByPatient(val.id).then((response) => {
+        this.dataloading = false
+        var sch = response.data.data.sch
+        this.editableTabsValue = "1";
+        this.editableTabs[0].tableWeekArrage = [];
+        this.editableTabs[1].tableWeekArrage = [];
+        this.editableTabs[2].tableWeekArrage = [];
+        this.editableTabs[0].checkedWeek = [];
+        this.editableTabs[1].checkedWeek = [];
+        this.editableTabs[2].checkedWeek = [];
 
-      this.editableTabs[0].checkedWeek = [];
-      this.editableTabs[1].checkedWeek = [];
-      this.editableTabs[2].checkedWeek = [];
+        var tempDate = new Date();
+        var day = tempDate.getDay();
+        console.log(day);
+        if (day == 0) {
+          day = 7;
+        }
+        console.log(val);
+        this.smart_keyword = val.name;
+        this.cur_smart_patient_id = val.id;
+        this.cur_smart_patient_name = val.name;
+        this.cur_smart_patient_no = val.dialysis_no;
+        //过滤出当前患者所有排班信息，填充对应的数据到智能排班列表
+        //根据患者的排班日期判断属于本周还是下周还是下下周
+        for (let i = 0; i < sch.length; i++) {
+          var week_type = this.getWeekType(
+            this.getTime(sch[i].schedule_date, "{y}-{m}-{d}")
+          );
 
-      var tempDate = new Date();
-      var day = tempDate.getDay();
-      console.log(day);
-      if (day == 0) {
-        day = 7;
-      }
-      console.log(val);
-      this.smart_keyword = val.name;
-      this.cur_smart_patient_id = val.id;
-      this.cur_smart_patient_name = val.name;
-      this.cur_smart_patient_no = val.dialysis_no;
-      //过滤出当前患者所有排班信息，填充对应的数据到智能排班列表
-      //根据患者的排班日期判断属于本周还是下周还是下下周
-      for (let i = 0; i < val.sch.length; i++) {
-        var week_type = this.getWeekType(
-            this.getTime(val.sch[i].schedule_date, "{y}-{m}-{d}")
-        );
-
-        switch (week_type) {
-          case "1":
-            var obj = {
-              mode_id: val.sch[i].mode_id,
-              sch_type: val.sch[i].schedule_type,
-              zone_id: val.sch[i].partition_id,
-              jihao_id: val.sch[i].bed_id,
-              is_edit: false,
-              week: this.getWeek(val.sch[i].schedule_week),
-              jihaos: this.partitionsProp[val.sch[i].partition_id].jihaos,
-              schedule_date: this.getDate(val.sch[i].schedule_week),
-              sch_id: val.sch[i].id,
-            };
-            let is_edit = true;
-            console.log("val.sch[i].order.id");
-            console.log(val.sch[i].order.id);
-            console.log("val.sch[i].order.id");
+          switch (week_type) {
+            case "1":
+              var obj = {
+                mode_id: sch[i].mode_id,
+                sch_type: sch[i].schedule_type,
+                zone_id:  sch[i].partition_id,
+                jihao_id:sch[i].bed_id,
+                is_edit: false,
+                week: this.getWeek(sch[i].schedule_week),
+                jihaos: this.partitionsProp[sch[i].partition_id].jihaos,
+                schedule_date: this.getDate(sch[i].schedule_week),
+                sch_id: sch[i].id,
+              };
+              let is_edit = true;
+              console.log("val.sch[i].order.id");
+              console.log(sch[i].order.id);
+              console.log("val.sch[i].order.id");
 
-            if (val.sch[i].schedule_week < day || val.sch[i].order.id > 0) {
-              is_edit = false;
-            } else {
-              is_edit = true;
-            }
-            obj.is_edit = is_edit;
+              if (sch[i].schedule_week < day || sch[i].order.id > 0) {
+                is_edit = false;
+              } else {
+                is_edit = true;
+              }
+              obj.is_edit = is_edit;
 
-            for (let b = 0; b < this.weeks.length; b++) {
-              console.log(val.sch[i].schedule_week);
-              console.log(this.weeks[b].week_type);
-              if (val.sch[i].schedule_week == this.weeks[b].week_type) {
-                if (
+              for (let b = 0; b < this.weeks.length; b++) {
+                console.log(sch[i].schedule_week);
+                console.log(this.weeks[b].week_type);
+                if (sch[i].schedule_week == this.weeks[b].week_type) {
+                  if (
                     this.weeks[b].week_type >= day ||
-                    val.sch[i].order.id == 0
-                ) {
-                  this.weeks[b].is_edit = true;
-                } else {
-                  this.weeks[b].is_edit = false;
+                    sch[i].order.id == 0
+                  ) {
+                    this.weeks[b].is_edit = true;
+                  } else {
+                    this.weeks[b].is_edit = false;
+                  }
+                  this.editableTabs[0].checkedWeek.push(this.weeks[b]);
                 }
-                this.editableTabs[0].checkedWeek.push(this.weeks[b]);
+
+
+
               }
-            }
 
-            this.editableTabs[0].tableWeekArrage.push(obj);
-            break;
-          case "2":
-            var obj2 = {
-              mode_id: val.sch[i].mode_id,
-              sch_type: val.sch[i].schedule_type,
-              zone_id: val.sch[i].partition_id,
-              jihao_id: val.sch[i].bed_id,
-              is_edit: false,
-              week: this.getWeek(val.sch[i].schedule_week),
-              jihaos: this.partitionsProp[val.sch[i].partition_id].jihaos,
-              schedule_date: this.getDate(val.sch[i].schedule_week + 7),
-              sch_id: val.sch[i].id,
-            };
-            let is_edit2 = true;
-            obj2.is_edit = is_edit2;
+              this.editableTabs[0].tableWeekArrage.push(obj);
+              break;
+            case "2":
+              var obj2 = {
+                mode_id: sch[i].mode_id,
+                sch_type: sch[i].schedule_type,
+                zone_id: sch[i].partition_id,
+                jihao_id: sch[i].bed_id,
+                is_edit: false,
+                week: this.getWeek(sch[i].schedule_week),
+                jihaos: this.partitionsProp[sch[i].partition_id].jihaos,
+                schedule_date: this.getDate(sch[i].schedule_week + 7),
+                sch_id: sch[i].id,
+              };
+              let is_edit2 = true;
+              obj2.is_edit = is_edit2;
+
+              // let checkObj2={
+              //   name:this.getWeek(val.sch[i].schedule_week),
+              //   week_type:val.sch[i].schedule_week,
+              //   is_edit:is_edit2
+              // }
 
-            // let checkObj2={
-            //   name:this.getWeek(val.sch[i].schedule_week),
-            //   week_type:val.sch[i].schedule_week,
-            //   is_edit:is_edit2
-            // }
+              // this.editableTabs[1].checkedWeek.push(checkObj2)
+
+              for (let b = 0; b < this.weeks.length; b++) {
+                if (sch[i].schedule_week == this.weeks[b].week_type) {
+                  // this.weeks[b].is_edit = true;
+                  this.editableTabs[1].checkedWeek.push(this.weeks[b]);
+                }
 
-            // this.editableTabs[1].checkedWeek.push(checkObj2)
 
-            for (let b = 0; b < this.weeks.length; b++) {
-              if (val.sch[i].schedule_week == this.weeks[b].week_type) {
-                this.weeks[b].is_edit = true;
-                this.editableTabs[1].checkedWeek.push(this.weeks[b]);
               }
-            }
 
-            this.editableTabs[1].tableWeekArrage.push(obj2);
-            break;
-
-          case "3":
-            let obj3 = {
-              mode_id: val.sch[i].mode_id,
-              sch_type: val.sch[i].schedule_type,
-              zone_id: val.sch[i].partition_id,
-              jihao_id: val.sch[i].bed_id,
-              is_edit: false,
-              week: this.getWeek(val.sch[i].schedule_week),
-              jihaos: this.partitionsProp[val.sch[i].partition_id].jihaos,
-              schedule_date: this.getDate(val.sch[i].schedule_week + 14),
-              sch_id: val.sch[i].id,
-            };
-            let is_edit3 = true;
-            obj3.is_edit = is_edit3;
-            for (let b = 0; b < this.weeks.length; b++) {
-              if (val.sch[i].schedule_week == this.weeks[b].week_type) {
-                this.weeks[b].is_edit = true;
-                this.editableTabs[2].checkedWeek.push(this.weeks[b]);
+              this.editableTabs[1].tableWeekArrage.push(obj2);
+              break;
+
+            case "3":
+              let obj3 = {
+                mode_id: sch[i].mode_id,
+                sch_type: sch[i].schedule_type,
+                zone_id: sch[i].partition_id,
+                jihao_id: sch[i].bed_id,
+                is_edit: false,
+                week: this.getWeek(sch[i].schedule_week),
+                jihaos: this.partitionsProp[sch[i].partition_id].jihaos,
+                schedule_date: this.getDate(sch[i].schedule_week + 14),
+                sch_id: sch[i].id,
+              };
+              let is_edit3 = true;
+              obj3.is_edit = is_edit3;
+              for (let b = 0; b < this.weeks.length; b++) {
+                if (sch[i].schedule_week == this.weeks[b].week_type) {
+                  // this.weeks[b].is_edit = true;
+                  this.editableTabs[2].checkedWeek.push(this.weeks[b]);
+
+                }
+
+
               }
-            }
 
-            this.editableTabs[2].tableWeekArrage.push(obj3);
-            break;
+              this.editableTabs[2].tableWeekArrage.push(obj3);
+              break;
+          }
+        }
+        if(this.editableTabsValue == "1") {
+          var tempDate = new Date();
+          var day = tempDate.getDay();
+          if (day == 0) {
+            day = 7;
+          }
+          for (let i = 0; i < this.weeks.length; i++) {
+            if (this.weeks[i].week_type < day) {
+              this.weeks[i].is_edit = false;
+            }
+          }
         }
-      }
 
-      this.current_all_sch = this.editableTabs;
+        this.current_patient_data = this.editableTabs
+
+        this.current_all_sch = this.editableTabs;
+
+      });
+
+
     },
     getDate(week_type) {
       console.log(week_type);
@@ -2741,6 +2857,7 @@ export default {
       }
     },
     showSmartDialog() {
+      this.dataloading = true
       this.editableTabsValue = "1";
       for (let i = 0; i < this.patientList.length; i++) {
         if (this.patientList[i].id == this.cur_info.patient_id) {
@@ -2779,6 +2896,7 @@ export default {
           return false;
         }
         var schedules = response.data.data.schedules;
+        this.dataloading = false
         this.current_all_sch[0].tableWeekArrage = [];
         this.current_all_sch[1].tableWeekArrage = [];
         this.current_all_sch[2].tableWeekArrage = [];
@@ -2793,9 +2911,10 @@ export default {
         if (day == 0) {
           day = 7;
         }
-        console.log(day);
 
         for (let i = 0; i < schedules.length; i++) {
+
+
           var week_type = this.getWeekType(
               this.getTime(schedules[i].schedule_date, "{y}-{m}-{d}")
           ).toString();
@@ -2826,18 +2945,20 @@ export default {
               }
               obj.is_edit = is_edit;
 
+
               for (let b = 0; b < this.weeks.length; b++) {
-                console.log(schedules[i].schedule_week);
-                console.log(this.weeks[b].week_type);
                 if (schedules[i].schedule_week == this.weeks[b].week_type) {
                   if (
-                      this.weeks[b].week_type >= day ||
+                      this.weeks[b].week_type >= day &&
                       schedules[i].order.id == 0
                   ) {
+                    console.log( "this.weeks[b].week_type")
+                    console.log( this.weeks[b].week_type )
                     this.weeks[b].is_edit = true;
                   } else {
                     this.weeks[b].is_edit = false;
                   }
+
                   this.editableTabs[0].checkedWeek.push(this.weeks[b]);
                 }
               }
@@ -2860,7 +2981,7 @@ export default {
 
               for (let b = 0; b < this.weeks.length; b++) {
                 if (schedules[i].schedule_week == this.weeks[b].week_type) {
-                  this.weeks[b].is_edit = true;
+                  // this.weeks[b].is_edit = true;
                   this.editableTabs[1].checkedWeek.push(this.weeks[b]);
                 }
               }
@@ -2882,7 +3003,7 @@ export default {
               };
               for (let b = 0; b < this.weeks.length; b++) {
                 if (schedules[i].schedule_week == this.weeks[b].week_type) {
-                  this.weeks[b].is_edit = true;
+                  // this.weeks[b].is_edit = true;
                   this.editableTabs[2].checkedWeek.push(this.weeks[b]);
                 }
               }
@@ -2894,47 +3015,53 @@ export default {
         }
       });
 
-      for (let i = 0; i < this.weeks.length; i++) {
+      if(this.editableTabsValue == "1") {
         var tempDate = new Date();
         var day = tempDate.getDay();
         if (day == 0) {
           day = 7;
         }
-        if (this.weeks[i].week_type >= day) {
-          this.weeks[i].is_edit = true;
-        } else {
-          this.weeks[i].is_edit = false;
+        for (let i = 0; i < this.weeks.length; i++) {
+          if (this.weeks[i].week_type < day) {
+            this.weeks[i].is_edit = false;
+          }
         }
       }
-      console.log("weeks");
-      console.log(this.weeks);
 
-      this.smartVisible = true;
 
-      var now = new Date();
-      var day = now.getDay();
-      switch (day) {
-        case 0:
-          break;
-        case 1:
-          break;
-        case 2:
-          break;
-        case 3:
-          break;
-        case 4:
-          break;
-        case 5:
-          break;
-        case 6:
-          break;
+      for (let i = 0; i < this.editableTabs.length; i++) {
+        for(let b = 0; b < this.editableTabs[i].tableWeekArrage.length;b++){
+          data[i]["week_type"] = this.getWeekByzhongwen(data[i].week);
+
+
+
+        }
       }
-      // this.current_all_sch = this.editableTabs
+
+      data.sort(function (a, b) {
+        return a.week_type - b.week_type;
+      });
+
+
+
+      this.current_patient_data = data
+      this.smartVisible = true;
       this.current_all_sch = data;
     },
+
     select_week(val) {
-      // this.current_all_sch = this.editableTabs
-      console.log(this.current_all_sch);
+      // for(this)
+
+
+      this.current_all_sch = this.editableTabs
+      // for(let i = 0; i < this.editableTabs[0].tableWeekArrage.length; i++){
+      //
+      //
+      // }
+
+
+
+
 
       var sch = [];
       for (let i = 0; i < this.current_all_sch.length; i++) {
@@ -2942,7 +3069,6 @@ export default {
           sch = this.current_all_sch[i];
         }
       }
-      console.log(sch);
 
       let data = [];
 
@@ -2957,10 +3083,7 @@ export default {
             obj = sch.tableWeekArrage[b];
           }
         }
-        console.log("日志");
 
-        console.log(is_new);
-        console.log(obj);
 
         let keyIndex = "";
         for (var key in this.partitionsProp) {
@@ -3023,7 +3146,9 @@ export default {
           this.editableTabs[i].tableWeekArrage = data;
         }
       }
-      //
+
+      this.current_all_sch = this.editableTabs
+
     },
     patientClick(row) {
       console.log(row);
@@ -3425,6 +3550,7 @@ export default {
             });
           });
         }
+
         this.scheduleZone.sort(this.compare("sort"));
       });
     },
@@ -4730,7 +4856,7 @@ export default {
       this.$emit("event1", val);
       this.partition_id = val;
       this.getWeekPanels();
-      this.getSchedules();
+      // this.getSchedules();
     },
     changeSchedule_type(val) {
       this.$emit("event2", val);

src/xt_pages/workforce/components/setup_template_dialog.vue

@@ -23,6 +23,11 @@
         >
         </el-date-picker>
       </el-form-item>
+
+      <el-form-item label="模板生成起始周" v-if="template_mode.original_week">
+       <label>{{ template_mode.original_week?'第'+template_mode.original_week+'周':""}}</label>
+      </el-form-item>
+
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="hide">取 消</el-button>
@@ -43,16 +48,20 @@ export default {
       pickerOptions0: {
         'firstDayOfWeek': 1,
         disabledDate(time) {
-          var nowDate = new Date();
-          var nowYear = nowDate.getFullYear();
-          var nowMonth = nowDate.getMonth() + 1;
-          var nowDay = nowDate.getDate()+7;
+
+          let weekFirstDay = new Date(new Date() - (new Date().getDay() - 1) * 86400000)
+          let firstMonth = Number(weekFirstDay.getMonth()) + 1
+
+          if (firstMonth < 10) {
+            firstMonth = '0' + firstMonth
+          }
+          let weekFirstDays = weekFirstDay.getDate() + 7;
+          if (weekFirstDays < 10) {
+            weekFirstDays = '0' + weekFirstDays;
+          }
+
           let time_temp =
-              nowYear +
-              "-" +
-              (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-              "-" +
-              (nowDay < 10 ? "0" + nowDay : nowDay);
+            weekFirstDay.getFullYear() + '-' + firstMonth + '-' + weekFirstDays
 
           time_temp = time_temp.replace(/-/g,'/'); // 将-替换成/，因为下面这个构造函数只支持/分隔的日期字符串
 
@@ -113,6 +122,7 @@ export default {
     },
     show() {
       this.clear()
+      this.form.week_time = this.template_mode.origin_mode
       this.visible = true
     },
     hide() {
@@ -162,6 +172,8 @@ export default {
         var resp = rs.data
         if (resp.state == 1) {
           this.template_mode.mode = this.form.mode
+          this.template_mode.original_week = this.form.week_time
+
           this.hide()
           this.$emit('chenge_mode', this.form.mode)
         } else {

src/xt_pages/workforce/components/template_table_three.vue

@@ -1658,18 +1658,18 @@ export default {
 
     },
     setEditData(patients,template,device_numbers) {
+      this.device_numbers = []
+      this.template = []
       this.patientList = patients
       this.template = template
       this.all_patients = patients
-
       this.cur_info.patient_name = this.patientList[0].name
       this.cur_info.mode_name = this.modes[0].name
       this.cur_info.patient_id = this.patientList[0].id
       this.cur_info.mode_id = this.modes[0].id
       this.$refs.patient_table.setCurrentRow(this.patientList[0])
       this.$refs.mode_table.setCurrentRow(this.modes[0])
-
-
+      this.device_numbers = device_numbers
 
     },search_two: function () {
       if (this.keywords.length == 0) {

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -495,9 +495,18 @@
         //   str = zone.join(",")
         // }
         var now_time = parseInt(this.week_type) * 86400 + this.start_time
+
+       let weekOfDay = parseInt(moment().format('E'))
+        let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
+        console.log("卡 is h2323233232",this.toStamp(next_monday))
+        let next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
+        console.log("下周日",this.toStamp(next_sunday))
+
+      
+
         const params = {
-          start_time: moment().week(moment().week() + 1).startOf('week').unix(),
-          end_time: moment().week(moment().week() + 1).endOf('week').unix(),
+          start_time: this.toStamp(next_monday),
+          end_time: this.toStamp(next_sunday),
           week_type: this.week_type,
           week_time: this.week_time,
           zone: this.zone,
@@ -700,7 +709,12 @@
           }
         }
         return name
-      }
+      },
+      toStamp(date) {
+        const myDate = new Date(date).getTime()/1000 - 28800
+        // const stmapEg = Date.parse(myDate) / 1000
+       return myDate
+      },
 
     }
   }

src/xt_pages/workforce/template.vue

@@ -118,55 +118,59 @@
 <!--          <template-table :editable="false" :device_numbers="device_numbers" :template="this_week_schedules" :is_editing="false"-->
 <!--                          :patients="patients" :data="data"></template-table>-->
 <!--        </el-tab-pane>-->
-        <el-tab-pane name="first" :disabled="template_mode.mode == 0">
-          <span slot="label"> 一周模版 {{first_template.week?first_template.week+'周':""}}
-          </span>
-          <template-table  ref="table"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"
-                          :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>
-
+        <el-tab-pane name="first" :disabled="template_mode.mode == 0" :label=" first_template.week?'一周模版'+ first_template.week+'周':'一周模版'">
+<!--          <span slot="label">-->
+<!--          </span>-->
 
         </el-tab-pane>
 
-        <el-tab-pane name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
-          <span slot="label">二周模版 {{  second_template.week?second_template.week+'周':""}}
-
-           </span>
-          <template-table-two  ref="table_two"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="second_template"
-                          :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData"  @saveSuccessTwo="refresh"></template-table-two>
+        <el-tab-pane :label="  second_template.week?'二周模版' + second_template.week+'周':'二周模版'" name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
+<!--          <template-table   ref="table_two"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"-->
+<!--                           :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>-->
 
         </el-tab-pane>
 
 
 
-        <el-tab-pane name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
-          <span slot="label">三周模版{{ third_template.week?third_template.week+'周':" "}}
+        <el-tab-pane :label="  third_template.week? '三周模版' + third_template.week+'周':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
+<!--          <span slot="label">三周模版{{ third_template.week?third_template.week+'周':" "}}-->
 <!--             <span v-if="schedule.execute_times%2==0">(下一周)</span>-->
 <!--             <span v-if="schedule.execute_times%2!=0">(本周)</span>-->
 <!--                  <span v-if="schedule.execute_times%4==0">(本周)</span>-->
 <!--             <span v-if="schedule.execute_times%4==1">(下一周)</span>-->
 <!--            <span v-if="schedule.execute_times%4==2">(下二周)</span>-->
 <!--             <span v-if="schedule.execute_times%4==3">(下三周)</span>-->
-           </span>
-          <template-table-three   ref="table_three" :editable="true" :device_numbers="device_numbers" :template="third_template" :is_editing="is_editing"
-                          :modes="modes"    :patients="patients" :data="data" @cancel_sch="refresh"  :template_mode="template_mode" @cur_info="cur_info" @saveData="saveData"  @saveSuccessTwo="refresh" ></template-table-three>
-
+<!--           </span>-->
+<!--          <template-table  ref="table_three"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"-->
+<!--                           :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>-->
         </el-tab-pane>
 
-      <el-tab-pane name="four" :disabled="template_mode.mode  != 4 ">
-          <span slot="label"> 四周模版 {{ four_template.week?four_template.week+'周':""}}
+      <el-tab-pane :label="four_template.week?'四周模版'+four_template.week+'周':'四周模版'" name="four" :disabled="template_mode.mode  != 4 ">
+<!--          <span slot="label"> 四周模版 {{ four_template.week?four_template.week+'周':""}}-->
 <!--             <span v-if="schedule.execute_times%2==0">(下一周)</span>-->
 <!--             <span v-if="schedule.execute_times%2!=0">(本周)</span>-->
 <!--            <span v-if="schedule.execute_times%4==0">(本周)</span>-->
 <!--             <span v-if="schedule.execute_times%4==1">(下一周)</span>-->
 <!--            <span v-if="schedule.execute_times%4==2">(下二周)</span>-->
 <!--             <span v-if="schedule.execute_times%4==3">(下三周)</span>-->
-           </span>
-          <template-table-four   ref="table_four" :editable="true" :device_numbers="device_numbers" :template="four_template" :is_editing="is_editing"
-                      :modes="modes"    :patients="patients" :data="data" @cancel_sch="refresh"  :template_mode="template_mode" @saveSuccess="refresh" @cur_info="cur_info" @saveData="saveData"   @saveSuccessTwo="refresh"></template-table-four>
+<!--           </span>-->
+<!--        <template-table   ref="table_four"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"-->
+<!--                         :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>-->
 
         </el-tab-pane>
 
+
+<!--        <template-table-two   v-show="activeName =='second'"  ref="table_two"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="second_template"-->
+<!--                             :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData"  @saveSuccessTwo="refresh"></template-table-two>-->
+<!--        <template-table-three  v-show="activeName =='third'"  ref="table_three" :editable="true" :device_numbers="device_numbers" :template="third_template" :is_editing="is_editing"-->
+<!--                                :modes="modes"    :patients="patients" :data="data" @cancel_sch="refresh"  :template_mode="template_mode" @cur_info="cur_info" @saveData="saveData"  @saveSuccessTwo="refresh" ></template-table-three>-->
+<!--        <template-table-four  v-show="activeName =='four'" ref="table_four" :editable="true" :device_numbers="device_numbers" :template="four_template" :is_editing="is_editing"-->
+<!--                               :modes="modes"    :patients="patients" :data="data" @cancel_sch="refresh"  :template_mode="template_mode" @saveSuccess="refresh" @cur_info="cur_info" @saveData="saveData"   @saveSuccessTwo="refresh"></template-table-four>-->
+
+
       </el-tabs>
+      <template-table  v-loading="dataloading"  ref="table"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="template"
+                        :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh" @setTemplate="setTemplate" @changeLoading="changeLoading"></template-table>
 
 
 <!--      <template-table  ref="table" :editable="true" :device_numbers="device_numbers" :template="tar_template" :is_editing="is_editing"-->
@@ -178,10 +182,10 @@
 
 
 
-      <set-up-template-dialog ref="setup_dialog" :template_mode="template_mode" :origin_mode="origin_mode"
-                              @chenge_mode="didChangeTemplateMode"></set-up-template-dialog>
     </div>
 
+    <set-up-template-dialog ref="setup_dialog" :template_mode="template_mode" :origin_mode="origin_mode"
+                            @chenge_mode="didChangeTemplateMode"></set-up-template-dialog>
     <el-dialog title="同步排班" width="600px" :visible.sync="newVisible">
       <el-form :model="form" ref="form" label-width="90px" :rules="rules">
         <el-form-item label="同步模板:" v-if="template_mode.mode == 1">
@@ -260,6 +264,7 @@ export default {
   },
   data: function () {
     return {
+      dataloading:true,
       is_editing:true,
       editable:false,
       data:[],
@@ -326,9 +331,6 @@ export default {
       newVisible: false,
       weekList: [],
       currentFirstDate1: '',
-      rules: {
-        copyWeek: [{required: true, message: "请选择复制时间段", trigger: "blur"}],
-      },
       weekNum: '',
       weekDayArr: [],
       todayDate: '',
@@ -425,41 +427,16 @@ export default {
 
         }
 
-
-
         var patients = resp.data.patients
-        // var schedules = resp.data.schedules
-
         this.template_mode = mode
         this.origin_mode = mode.mode
         this.device_numbers = device_numbers
         this.patients = patients
-
-
-
-        this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers)
-        this.$refs.table_two.setEditData(this.patients,this.second_template,this.device_numbers)
-        this.$refs.table_three.setEditData(this.patients,this.third_template,this.device_numbers)
-        this.$refs.table_four.setEditData(this.patients,this.four_template,this.device_numbers)
-
+        this.tar_template = this.first_template
+        this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers,this.templates,  this.activeName)
 
         var fakeTemplateItems = []
-        // for (let index = 0; index < schedules.length; index++) {
-        //   const schedule = schedules[index]
-        //   var item = {}
-        //   this.$set(item, 'id', schedule.id)
-        //   this.$set(item, 'template_id', 0)
-        //   this.$set(item, 'device_number_id', schedule.bed_id)
-        //   this.$set(item, 'treat_mode', schedule.mode_id)
-        //   this.$set(item, 'weekday', schedule.schedule_week)
-        //   this.$set(item, 'time_type', schedule.schedule_type)
-        //   var patient = {}
-        //   this.$set(patient, 'id', schedule.patient_id)
-        //   this.$set(patient, 'name', schedule.patient)
-        //   this.$set(item, 'patient', patient)
-        //
-        //   fakeTemplateItems.push(item)
-        // }
+
         this.this_week_schedules.items = fakeTemplateItems
 
       } else {
@@ -470,19 +447,48 @@ export default {
 
   },
   methods: {
+    changeLoading(){
+      this.dataloading = false
+    },
+    setTemplate(items){
+      if(this.template_mode.mode == 1){
+        this.first_template = items[0]
+      }else   if(this.template_mode.mode == 2){
+        this.first_template = items[0]
+        this.second_template = items[1]
+      }else   if(this.template_mode.mode == 3){
+        this.first_template = items[0]
+        this.second_template = items[1]
+        this.third_template = items[2]
+      }else   if(this.template_mode.mode == 4){
+        this.first_template = items[0]
+        this.second_template = items[1]
+        this.third_template = items[2]
+        this.four_template = items[3]
+      }
+    },
     handleClick(val){
+      this.dataloading = true
       if(this.activeName == "first"){
         this.activeName = "first"
-        this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers)
+        // this.tar_template = this.first_template
+
+        this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers,this.templates,  this.activeName)
       }else if(this.activeName == "second"){
         this.activeName = "second"
-        this.$refs.table_two.setEditData(this.patients,this.second_template,this.device_numbers)
+        // this.tar_template = this.second_template
+
+        this.$refs.table.setEditData(this.patients,this.second_template,this.device_numbers,this.templates,  this.activeName)
       }else if(this.activeName == "third"){
         this.activeName = "third"
-        this.$refs.table_three.setEditData(this.patients,this.third_template,this.device_numbers)
+        // this.tar_template = this.third_template
+
+        this.$refs.table.setEditData(this.patients,this.third_template,this.device_numbers,this.templates,  this.activeName)
       }else {
         this.activeName = "four"
-        this.$refs.table_four.setEditData(this.patients, this.four_template,this.device_numbers)
+        // this.tar_template = this.four_template
+
+        this.$refs.table.setEditData(this.patients, this.four_template,this.device_numbers,this.templates,  this.activeName)
       }
 
     },
@@ -558,7 +564,7 @@ export default {
           var mode = resp.data.template_mode
           var device_numbers = resp.data.device_numbers
           var templates = resp.data.templates
-
+          this.templates = templates
           if(templates.length > 0){
             this.firstWeekData = templates[0].items
             this.first_template = templates[0]
@@ -1456,13 +1462,13 @@ export default {
       if (!is_system_zone || !is_device_number) {
         console.log("123123123123")
         this.dialogVisible = true
-        return
+
       } else {
 
 
         if (is_exist_repeat) {
           this.isExistRepeatVisible = true
-          return
+
         } else {
 
           this.$alert('您提交的排班信息已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
@@ -1475,8 +1481,7 @@ export default {
           let params = {
             schedule: datas
           }
-          console.log("datas")
-          console.log(datas)
+
           //今天的时间
           var day2 = new Date()
           day2.setTime(day2.getTime())
@@ -1487,7 +1492,8 @@ export default {
             if (response.data.state == 0) {
               return false
             }
-            this.getWeekPanels("")
+            this.$message.success("导入成功")
+            // this.getWeekPanels("")
             this.getInitData()
 
           })
@@ -1516,9 +1522,30 @@ export default {
 
           this.first_template = templates[0]
           this.second_template = templates[1]
-
+          this.templates = templates
           this.third_template = templates[2]
           this.four_template = templates[3]
+          if(this.activeName == "first"){
+            this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers,this.templates,  this.activeName)
+
+
+          }else if(this.activeName == "second"){
+
+            this.$refs.table.setEditData(this.patients,this.second_template,this.device_numbers,this.templates,  this.activeName)
+
+
+          }else if(this.activeName == "third"){
+
+            this.$refs.table.setEditData(this.patients,this.third_template,this.device_numbers,this.templates,  this.activeName)
+
+
+          }else if(this.activeName == "four"){
+
+            this.$refs.table.setEditData(this.patients,this.four_template,this.device_numbers,this.templates,  this.activeName)
+
+
+          }
+
 
           // var fakeTemplateItems = []
           // for (let index = 0; index < schedules.length; index++) {
@@ -3130,10 +3157,10 @@ export default {
 
 
 
-          this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers)
-          this.$refs.table_two.setEditData(this.patients,this.second_template,this.device_numbers)
-          this.$refs.table_three.setEditData(this.patients,this.third_template,this.device_numbers)
-          this.$refs.table_four.setEditData(this.patients,this.four_template,this.device_numbers)
+          this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers,this.templates,this.activeName)
+          // this.$refs.table_two.setEditData(this.patients,this.second_template,this.device_numbers)
+          // this.$refs.table_three.setEditData(this.patients,this.third_template,this.device_numbers)
+          // this.$refs.table_four.setEditData(this.patients,this.four_template,this.device_numbers)
 
 
           var fakeTemplateItems = []
@@ -3163,41 +3190,16 @@ export default {
 
     },saveData(val){
       var tempDataOne = []
-      var tempDataTwo = []
-      var tempDataThree = []
-      var tempDataFour = []
+      // var tempDataTwo = []
+      // var tempDataThree = []
+      // var tempDataFour = []
       for(let i = 0; i < val.length; i++){
-        if(val[i].t_id == this.first_template.id){
           tempDataOne.push(val[i])
-        }
-        if(val[i].t_id == this.second_template.id){
-          tempDataTwo.push(val[i])
-        }
-        if(val[i].t_id == this.third_template.id){
-          tempDataThree.push(val[i])
-        }
-        if(val[i].t_id == this.four_template.id){
-          tempDataFour.push(val[i])
-        }
       }
 
       if(tempDataOne.length > 0){
         this.$refs.table.SetSmartSch(tempDataOne)
       }
-      if(tempDataTwo.length > 0){
-         this.$refs.table_two.SetSmartSch(tempDataTwo)
-      }
-      if(tempDataThree.length > 0){
-         this.$refs.table_three.SetSmartSch(tempDataThree)
-      }
-      if(tempDataFour.length > 0){
-        this.$refs.table_four.SetSmartSch(tempDataFour)
-      }
-
-
-
-
-
 
 
       // this.first_template.items.push({device_number_id:652,id:0,patient_id:7007,template_id:421,time_type:2,treat_mode:2,weekday:4})
@@ -3385,27 +3387,23 @@ export default {
           this.$refs.table.showSmartDialog()
         }else if(this.activeName == "second"){
           this.activeName = "second"
-          this.$refs.table_two.showSmartDialog()
+          this.$refs.table.showSmartDialog()
         }else if(this.activeName == "third"){
           this.activeName = "third"
-          this.$refs.table_three.showSmartDialog()
+          this.$refs.table.showSmartDialog()
         }else {
           this.activeName = "four"
-          this.$refs.table_four.showSmartDialog()
+          this.$refs.table.showSmartDialog()
         }
       })
 
     },saveClick:function (){
       if(this.template_mode.mode == 0){
-        this.$router.go(-1)
+        // this.$router.go(-1)
+        this.$router.back()
+
       }else{
         this.$message.success("保存成功")
-
-        // this.$refs.table.saveAction()
-        // this.$refs.table_two.saveAction()
-        // this.$refs.table_three.saveAction()
-        // this.$refs.table_four.saveAction()
-        // this.$router.go(-1)
         this.$router.back()
 
       }
@@ -3491,10 +3489,10 @@ export default {
 
 
 
-            this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers)
-            this.$refs.table_two.setEditData(this.patients,this.second_template,this.device_numbers)
-            this.$refs.table_three.setEditData(this.patients,this.third_template,this.device_numbers)
-            this.$refs.table_four.setEditData(this.patients,this.four_template,this.device_numbers)
+            this.$refs.table.setEditData(this.patients,this.first_template,this.device_numbers,this.templates,  this.activeName)
+            // this.$refs.table_two.setEditData(this.patients,this.second_template,this.device_numbers)
+            // this.$refs.table_three.setEditData(this.patients,this.third_template,this.device_numbers)
+            // this.$refs.table_four.setEditData(this.patients,this.four_template,this.device_numbers)
 
 
             var fakeTemplateItems = []