3月27

src/xt_pages/workforce/appointment.vue

@@ -90,169 +90,184 @@
         <!-- <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button> -->
       </div>
     </div>
-    <div class="app-container">
-      <div style="right:30px;position:absolute;z-index:99">
-        <span>导出周次:</span>
-        <el-date-picker
-            v-model="weekTime"
-            type="week"
-            format="yyyy 第 WW 周"
-            placeholder="选择周"
-            :picker-options="{'firstDayOfWeek': 1}"
-            @change="changeWeek"
-        >
-        </el-date-picker>
-      </div>
-      <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs" @tab-click="handleClick">
-        <el-tab-pane name="historyWeek">
-          <span slot="label"><i class="el-icon-date"></i> 历史周期 ({{ theWeek.historyWeek }}) </span>
-        </el-tab-pane>
-        <el-tab-pane name="lastWeek">
-          <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
-        </el-tab-pane>
-        <el-tab-pane name="thisWeek">
-          <span slot="label"><i class="el-icon-date"></i> 本周 ({{ theWeek.thisWeek }})</span>
-        </el-tab-pane>
-        <el-tab-pane name="nextWeek">
-          <span slot="label"><i class="el-icon-date"></i> 下一周 ({{ theWeek.nextWeek }})</span>
-        </el-tab-pane>
-        <el-tab-pane name="nextTwoWeek">
-          <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
-        </el-tab-pane>
-      </el-tabs>
-      <div v-if="!is_edit">
-        <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"  @guanliu_show="guanliu" @mode_name="touximoshi" v-show="showtableOne"  @event6="changeScheduleType">
-        </table-data>
-        <!-- @event6="changeScheduleType" -->
-      </div>
-      <!-- 编辑 -->
-       <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
-          :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone"
-          title="" @event1="changePartition"@event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay">
-          <div  style="position: relative;height: 50px">
-            <div style="position: fixed;height: 50px;width: 97%;background: #fff;z-index: 100;padding: 5px;">
-              <div style="position: relative;">
-                <!-- style="position: fixed;" class="position"-->
-                  <div style="display: inline-block;">
-                    <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs" @tab-click="historyclick">
-                      <el-tab-pane name="beforeWeek">
-                        <span slot="label"><i class="el-icon-date"></i> 上上周 ({{ theWeek.historyWeek }})</span>
-                      </el-tab-pane>
-                      <el-tab-pane name="lastWeek">
-                        <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
-                      </el-tab-pane>
-                      <el-tab-pane name="thisWeek">
-                        <span slot="label"><i class="el-icon-date"></i> 本周 ({{ theWeek.thisWeek }})</span>
-                      </el-tab-pane>
-                      <el-tab-pane name="nextWeek">
-                        <span slot="label"><i class="el-icon-date"></i> 下一周 ({{ theWeek.nextWeek }})</span>
-                      </el-tab-pane>
-                      <el-tab-pane name="nextTwoWeek">
-                        <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
-                      </el-tab-pane>
-                    </el-tabs>
-                  </div>
-                  <div style="display: inline-block;float: right;">
-                    <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
-                    <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
-                    <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
-                      导出排班
-                    </el-button>
-                    <el-button
-                        @click="generateLog()"
-                        class="filter-item"
-                        type="primary"
-                        v-if="is_edit"
-                        size="small"
-                    >下载日志
-                    </el-button>
-                    <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
-                    </el-button>
-                    <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
-                    <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button>
-                    <el-button type="primary" size="small" v-if="!is_edit" @click="editsch">编辑排班</el-button>
-                    <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button>
-                  </div>
+    <div>
+      
+      <div class="app-container" style="padding: 0 20px 20px 20px;">
+        <div>
+          <div style="position: relative;height: 57px">
+            <div style="position: fixed;width: 80%;z-index: 100;background: #fff;">
+              <div>
+                <div style="display: inline-block;">
+                  <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs" @tab-click="handleClick">
+                    <el-tab-pane name="historyWeek">
+                      <span slot="label"><i class="el-icon-date"></i> 历史周期 ({{ theWeek.historyWeek }}) </span>
+                    </el-tab-pane>
+                    <el-tab-pane name="lastWeek">
+                      <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
+                    </el-tab-pane>
+                    <el-tab-pane name="thisWeek">
+                      <span slot="label"><i class="el-icon-date"></i> 本周 ({{ theWeek.thisWeek }})</span>
+                    </el-tab-pane>
+                    <el-tab-pane name="nextWeek">
+                      <span slot="label"><i class="el-icon-date"></i> 下一周 ({{ theWeek.nextWeek }})</span>
+                    </el-tab-pane>
+                    <el-tab-pane name="nextTwoWeek">
+                      <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
+                    </el-tab-pane>
+                  </el-tabs>
+                </div>
+                <div style="display: inline-block;float:right;z-index:99">
+                  <span>导出周次:</span>
+                  <el-date-picker
+                      v-model="weekTime"
+                      type="week"
+                      format="yyyy 第 WW 周"
+                      placeholder="选择周"
+                      :picker-options="{'firstDayOfWeek': 1}"
+                      @change="changeWeek"
+                  >
+                  </el-date-picker>
+                </div>
               </div>
             </div>
           </div>
-        </edit-table-data>
-        <!-- 编辑上上周 -->
-        <beforeweekTable ref="beforeweeks" v-show="beforeshow" :week-time="activeName" :partitions-prop="partitions"
-                  :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone" @event3="changeWeekDay">
-          <div class="position">
-            <div>
-              <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs" @tab-click="historyclick">
-                <el-tab-pane name="beforeWeek">
-                  <span slot="label"><i class="el-icon-date"></i> 上上周 ({{ theWeek.historyWeek }})</span>
-                </el-tab-pane>
-                <el-tab-pane name="lastWeek">
-                  <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
-                </el-tab-pane>
-                <el-tab-pane name="thisWeek">
-                  <span slot="label"><i class="el-icon-date"></i> 本周 ({{ theWeek.thisWeek }})</span>
-                </el-tab-pane>
-                <el-tab-pane name="nextWeek">
-                  <span slot="label"><i class="el-icon-date"></i> 下一周 ({{ theWeek.nextWeek }})</span>
-                </el-tab-pane>
-                <el-tab-pane name="nextTwoWeek">
-                  <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
-                </el-tab-pane>
-              </el-tabs>
-            </div>
-            <div style="display:flex;align-items:center">
-              <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
-              <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
-                导出排班
-              </el-button>
-              <el-button
-                  @click="generateLog()"
-                  class="filter-item"
-                  type="primary"
-                  v-if="is_edit"
-                  size="small"
-              >下载日志
-              </el-button>
-              <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
-              </el-button>
-              <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
-              <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button>
-              <el-button type="primary" size="small" v-if="!is_edit" @click="editsch">编辑排班</el-button>
-              <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button>
+          <div >
+            <div v-if="!is_edit" >
+              <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"  @guanliu_show="guanliu" @mode_name="touximoshi" v-show="showtableOne"  @event6="changeScheduleType">
+              </table-data>
+              <!-- @event6="changeScheduleType" -->
             </div>
           </div>
-        </beforeweekTable>
-        <!-- 历史 -->
-        <HistoryWeekTable v-show="showtable" ref="tableDataZero"  :week-time="activeName" :partitions-prop="partitions"
-                  :schedule-zone-row-prop="scheduleZoneRow"
-                  :schedule-zone-prop="scheduleZone" title="" >
-          </HistoryWeekTable>
-      <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
-        <el-form :model="form" ref="form" label-width="90px" :rules="rules">
-          <el-form-item label="周次:">
-            <el-radio v-model="form.lastweek" label="1">上周排班信息</el-radio>
-            <el-radio v-model="form.lastweek" label="2">本周排班信息</el-radio>
-          </el-form-item>
-          <el-form-item label="复制到 : " required prop="copyWeek">
-            <el-select v-model="form.copyWeek" placeholder="请选择">
-              <el-option
-                  v-for="item in typeOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="newVisible=false">取 消</el-button>
-          <el-button  v-loading="copySchLoading" type="primary" @click="submitAction('form')">保 存</el-button>
+          <!-- 编辑 -->
+        <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
+            :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone"
+            title="" @event1="changePartition"@event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay">
+            <div  style="position: relative;height: 50px">
+              <div style="position: fixed;height: 50px;width: 97%;background: #fff;z-index: 100;padding: 5px;">
+                <div style="position: relative;">
+                  <!-- style="position: fixed;" class="position"-->
+                    <div style="display: inline-block;">
+                      <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs" @tab-click="historyclick">
+                        <el-tab-pane name="beforeWeek">
+                          <span slot="label"><i class="el-icon-date"></i> 上上周 ({{ theWeek.historyWeek }})</span>
+                        </el-tab-pane>
+                        <el-tab-pane name="lastWeek">
+                          <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
+                        </el-tab-pane>
+                        <el-tab-pane name="thisWeek">
+                          <span slot="label"><i class="el-icon-date"></i> 本周 ({{ theWeek.thisWeek }})</span>
+                        </el-tab-pane>
+                        <el-tab-pane name="nextWeek">
+                          <span slot="label"><i class="el-icon-date"></i> 下一周 ({{ theWeek.nextWeek }})</span>
+                        </el-tab-pane>
+                        <el-tab-pane name="nextTwoWeek">
+                          <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
+                        </el-tab-pane>
+                      </el-tabs>
+                    </div>
+                    <div style="display: inline-block;float: right;">
+                      <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
+                      <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
+                      <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
+                        导出排班
+                      </el-button>
+                      <el-button
+                          @click="generateLog()"
+                          class="filter-item"
+                          type="primary"
+                          v-if="is_edit"
+                          size="small"
+                      >下载日志
+                      </el-button>
+                      <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
+                      </el-button>
+                      <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
+                      <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button>
+                      <el-button type="primary" size="small" v-if="!is_edit" @click="editsch">编辑排班</el-button>
+                      <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button>
+                    </div>
+                </div>
+              </div>
+            </div>
+          </edit-table-data>
+          <!-- 编辑上上周 -->
+          <beforeweekTable ref="beforeweeks" v-show="beforeshow" :week-time="activeName" :partitions-prop="partitions"
+                    :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone" @event3="changeWeekDay">
+            <div class="position">
+              <div>
+                <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs" @tab-click="historyclick">
+                  <el-tab-pane name="beforeWeek">
+                    <span slot="label"><i class="el-icon-date"></i> 上上周 ({{ theWeek.historyWeek }})</span>
+                  </el-tab-pane>
+                  <el-tab-pane name="lastWeek">
+                    <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
+                  </el-tab-pane>
+                  <el-tab-pane name="thisWeek">
+                    <span slot="label"><i class="el-icon-date"></i> 本周 ({{ theWeek.thisWeek }})</span>
+                  </el-tab-pane>
+                  <el-tab-pane name="nextWeek">
+                    <span slot="label"><i class="el-icon-date"></i> 下一周 ({{ theWeek.nextWeek }})</span>
+                  </el-tab-pane>
+                  <el-tab-pane name="nextTwoWeek">
+                    <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
+                  </el-tab-pane>
+                </el-tabs>
+              </div>
+              <div style="display:flex;align-items:center">
+                <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
+                <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
+                  导出排班
+                </el-button>
+                <el-button
+                    @click="generateLog()"
+                    class="filter-item"
+                    type="primary"
+                    v-if="is_edit"
+                    size="small"
+                >下载日志
+                </el-button>
+                <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
+                </el-button>
+                <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
+                <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button>
+                <el-button type="primary" size="small" v-if="!is_edit" @click="editsch">编辑排班</el-button>
+                <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button>
+              </div>
+            </div>
+          </beforeweekTable>
+          <!-- 历史 -->
+          <HistoryWeekTable v-show="showtable" ref="tableDataZero"  :week-time="activeName" :partitions-prop="partitions"
+                    :schedule-zone-row-prop="scheduleZoneRow"
+                    :schedule-zone-prop="scheduleZone" title="" >
+            </HistoryWeekTable>
+          <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
+            <el-form :model="form" ref="form" label-width="90px" :rules="rules">
+              <el-form-item label="周次:">
+                <el-radio v-model="form.lastweek" label="1">上周排班信息</el-radio>
+                <el-radio v-model="form.lastweek" label="2">本周排班信息</el-radio>
+              </el-form-item>
+              <el-form-item label="复制到 : " required prop="copyWeek">
+                <el-select v-model="form.copyWeek" placeholder="请选择">
+                  <el-option
+                      v-for="item in typeOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="newVisible=false">取 消</el-button>
+              <el-button  v-loading="copySchLoading" type="primary" @click="submitAction('form')">保 存</el-button>
+            </div>
+          </el-dialog>
         </div>
-      </el-dialog>
+      </div>
     </div>
   </div>
 </template>

src/xt_pages/workforce/components/tableData.vue

@@ -1,94 +1,97 @@
 <template>
   <div id="table_data">
+    <div style="position: relative;height: 48px;padding-bottom:12px ">
+      <div style="position: fixed;z-index: 100;background: #fff;width: 80%;">
+        <div class="cell clearfix" v-if="weekTime == 'thisWeek' || weekTime == 'nextWeek'  || weekTime == 'nextTwoWeek' ">
+          <div class="select_list">
 
-    <div class="cell clearfix" v-if="weekTime == 'thisWeek' || weekTime == 'nextWeek'  || weekTime == 'nextTwoWeek' ">
-      <div class="select_list">
+            <span>日期：</span>
+            <el-select
+                v-model="week_type"
+                placeholder="请选择"
+                multiple
+              @change="changeWeekDay"
+              style="width: 120px;"
+            >
+              <el-option
+                  v-for="(item,index) in weeks"
+                  :key="index"
+                  :label="item"
+                  :value="item"
+              >
+              </el-option>
+            </el-select>
 
-        <span>日期：</span>
-        <el-select
-            v-model="week_type"
-            placeholder="请选择"
-            multiple
-           @change="changeWeekDay"
-           style="width: 120px;"
-        >
-          <el-option
-              v-for="(item,index) in weeks"
-              :key="index"
-              :label="item"
-              :value="item"
-          >
-          </el-option>
-        </el-select>
-
-        <span>分区：</span>
-        <el-select
-            v-model="partition_id"
-            multiple
-            placeholder="请选择"
-            @change="changePartiton"
-            style="width: 120px;"
-        >
-          <el-option
-              v-for="item in this.zones"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-          >
-          </el-option>
-        </el-select>
-
-        <span>班次：</span>
-        <el-select
-            v-model="scheduleType_val"
-            clearable
-            placeholder="请选择"
-            @change="scheduleType_change"
-            style="width: 120px;"
-        >
-          <!-- <el-option value=0 label="请选择"></el-option>   multiple-->
-          <el-option
-              v-for="item in this.scheduleType"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-          >
-          </el-option>
-        </el-select>
+            <span>分区：</span>
+            <el-select
+                v-model="partition_id"
+                multiple
+                placeholder="请选择"
+                @change="changePartiton"
+                style="width: 120px;"
+            >
+              <el-option
+                  v-for="item in this.zones"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+              >
+              </el-option>
+            </el-select>
 
-      </div>
-      <el-input
-          size="small"
-          style="width: 120px;margin-left: 20px"
-          class="filter-item"
-          v-model.trim="keywords"
-          placeholder="病人名称/透析号"
-          @keyup.enter.native='search'
-      />
-      <el-button
-          size="small"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          @click="search"
-
-      >搜索</el-button>
-      <div class="switch">
-        <el-switch
-          v-model="value1"
-          :active-value=true
-          active-text="显示透析器/灌流器"
-          @change="switchThis(value1)">
-
-        </el-switch>
-      </div>
-      <div class="switch">
-        <el-switch
-          v-model="modename_value"
-          :active-value=true
-          active-text="显示透析模式"
-          @change="switchMode(modename_value)">
-        </el-switch>
+            <span>班次：</span>
+            <el-select
+                v-model="scheduleType_val"
+                clearable
+                placeholder="请选择"
+                @change="scheduleType_change"
+                style="width: 120px;"
+            >
+              <!-- <el-option value=0 label="请选择"></el-option>   multiple-->
+              <el-option
+                  v-for="item in this.scheduleType"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+              >
+              </el-option>
+            </el-select>
+
+          </div>
+          <el-input
+              size="small"
+              style="width: 120px;margin-left: 20px"
+              class="filter-item"
+              v-model.trim="keywords"
+              placeholder="病人名称/透析号"
+              @keyup.enter.native='search'
+          />
+          <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              icon="el-icon-search"
+              @click="search"
+
+          >搜索</el-button>
+          <div class="switch">
+            <el-switch
+              v-model="value1"
+              :active-value=true
+              active-text="显示透析器/灌流器"
+              @change="switchThis(value1)">
+
+            </el-switch>
+          </div>
+          <div class="switch">
+            <el-switch
+              v-model="modename_value"
+              :active-value=true
+              active-text="显示透析模式"
+              @change="switchMode(modename_value)">
+            </el-switch>
+          </div>
+        </div>
       </div>
     </div>
     <!-- <el-dialog :visible.sync="searchTableVisible" width="80%" class="eldialog">
@@ -242,9 +245,8 @@
       </div>
     </el-dialog>
 
-    <div class="center-tab">
-
-      <el-table
+    <div class="center-tab" style="position: relative;height: 70vh;overflow: overlay;">
+      <el-table class="eltables"
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
@@ -271,7 +273,7 @@
           label="分区"
           width="50"
           align="center"
-          fixed
+          
         >
         </el-table-column>
         <el-table-column
@@ -279,7 +281,7 @@
           label="机号"
           align="center"
           min-width="40"
-          fixed
+          
 
         ></el-table-column>
         <el-table-column
@@ -4312,6 +4314,16 @@ textarea{
     z-index: 3 !important;
 }
 }
+.eltables{
+  .el-table__header-wrapper{
+    position: relative;
+    height: 68px;
+    .el-table__header{
+      position: fixed;
+      z-index: 100;
+    }
+  }
+}
 
 // .el-table td .cell{
 //   padding: 0px 0px !important;