新分支

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

              <span>{{scope.row.dialysis_solution.dialysis_irrigation}}</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_solution.dialysis_strainer}}</span>
+           </template>
+        </el-table-column>
+        
         
         <el-table-column align="center" label="置换液" v-if="dialysisSett.displace_liqui_part==1">
            <template slot-scope="scope">

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

                 <td width="100" v-if="dialysisSett.dialyzer_perfusion_apparatus == 1">透析器/灌流器</td>
                 <td width="100"  v-if="dialysisSett.dialysis_dialyszers == 1">透析器</td>
                 <td width="100" v-if="dialysisSett.dialysis_irrigation ==1">灌流器</td>
+                <td width="100" v-if="dialysisSett.dialysis_irrigation ==1">滤过器</td>
                  <td width="100" v-if="dialysisSett.displace_liqui_part==1">置换液</td>
                 <td width="100"  v-if="dialysisSett.displace_liqui_value==1">置换液总量</td>
                 <td width="100" v-if="dialysisSett.kalium==1">钾</td>
                 <td width="100" v-if="dialysisSett.dialysis_irrigation ==1">
                      <span>{{item.dialysis_solution.dialysis_irrigation}}</span>
                 </td>
+                <td width="100" v-if="dialysisSett.dialysis_irrigation ==1">
+                     <span>{{item.dialysis_solution.dialysis_strainer}}</span>
+                </td>
                 <td width="100"  v-if="dialysisSett.displace_liqui_part==1">
                   <span>{{getDisplaceLiquiPart(item.dialysis_solution.displace_liqui_part)}}</span>
                 </td>

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

           }
       }
 
-      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585){
+      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587){
         var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

             var hours = date.getHours()
             var minites = date.getMinutes()
 
+            if (month < 10) {
+              month = '0' + month
+            }
+            if (day < 10) {
+              day = '0' + day
+            }
+            if (hours < 10) {
+              hours = '0' + hours
+            }
+            if (minites < 10) {
+              minites = '0' + minites
+            }
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+           }else if (this.$store.getters.xt_user.org.id == 10587){
+            var date = new Date()
+            var year = date.getFullYear()
+            var month = date.getMonth() + 1
+            var day = date.getDate()
+
+            var hours = date.getHours()
+            var minites = date.getMinutes()
+
             if (month < 10) {
               month = '0' + month
             }

src/xt_pages/role/admin.vue

           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDrug">自动生成</el-button> -->
+          @click="toAutoDrug">自动生成</el-button>
 
 
           <el-button
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button>
+          @click="toAutoDiagnose">自动脚本</el-button> -->
      </div>
 
 

src/xt_pages/workforce/appointment.vue

         <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
                     :schedule-zone-row-prop="scheduleZoneRow"
                     :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
-                    @event2="changeSchedule"  @event3="changeWeekDay" v-show="showtableOne">
+                    @event2="changeSchedule"  @event3="changeWeekDay" @event6="changeScheduleType" v-show="showtableOne">
         </table-data>
       </div>
       <!-- 编辑 -->
       newDay: [],
       templateObj: {},
       week_date:""
+      
     }
   },
   components: {
       console.log("whhwhwhwhwhwh",date)
       console.log("this.templateObj.template_id == 1",this.templateObj.template_id)
       console.log("week2333333333333333",this.week_date)
+      console.log("woowowowow",this.schedule_type)
       if (this.templateObj.template_id == 1) {
         this.$router.push({path: '/workforce/schedule/print', query: {date: date}})
       }
       this.week_date = str
     },
 
+    changeScheduleType(val){
+      this.schedule_type = val
+    },
+
     changeWeek(val) {
       this.start_time = ""
       this.end_time = ""

src/xt_pages/workforce/components/tableData.vue

       isShowXiaWu:true,
       isShowWanShang:true,
       schedulesGroup:[],
-      count_num:null
+      count_num:null,
+      schedule_type:0
     };
   },
 
         this.isShowXiaWu = true
         this.isShowWanShang = true
       }
+      this.schedule_type =val
+      this.$emit('event6', val)
+
     },
     switchThis(flag){
       if(this.value1==false){