库存显示展示

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -1145,7 +1145,7 @@
     </div>
 
 
-    <div id="dialysis-print-box-1-2" class="dialysis-print-order print-template-two print_page_main_content" style="position: relative;">
+    <div id="dialysis-print-box-1-2" class="dialysis-print-order print-template-two print_page_main_content" style="position: relative;" v-if="org_id == 10346">
      
       <div class="dialysis-print-order">
       <table class="print-table">

src/xt_pages/workforce/appointment.vue

@@ -68,29 +68,29 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
       <div style="display:flex;align-items:center">
         <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>
+        <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
         <!-- <el-button @click="printTable" type="primary" size="small">打印排班</el-button> -->
         <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
           导出排班
         </el-button>
-        <el-button
+        <!-- <el-button
             @click="generateLog()"
             class="filter-item"
             type="primary"
             v-if="is_edit"
             size="small"
         >下载日志
-        </el-button>
+        </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" @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="is_edit = false ">退出编辑</el-button>
+        <!-- <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:fixed;z-index:99">
+      <div style="right:30px;position:absolute;z-index:99">
         <span>导出周次:</span>
         <el-date-picker
             v-model="weekTime"
@@ -119,10 +119,6 @@
 
       </el-tabs>
 
-      <!-- </el-col>
-    </el-row> -->
-<!--  -->
-
       <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
                   :schedule-zone-row-prop="scheduleZoneRow"
                   :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
@@ -130,10 +126,36 @@
       </table-data>
 
       <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"></edit-table-data>
-
+                        :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone"
+                         title="" @event1="changePartition"
+                         @event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay">
+                      
+        <div class="position">
+          <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
+          <div></div>
+        <div style="display:flex;align-items:center">
+          <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>
+        </edit-table-data>
 
       <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
         <el-form :model="form" ref="form" label-width="90px" :rules="rules">
@@ -225,6 +247,7 @@ export default {
       days: [],
       logs: [],
       is_edit: false,
+      schedulingTableVisible:false,//全屏
       scheduleZoneRow: [],
       downloadLoading: false,
       msgTipVisible: false,
@@ -276,7 +299,8 @@ export default {
     ScheduleUploadExcel,
     tableData,
     BreadCrumb,
-    UploadExcel
+    UploadExcel,
+
   },
   methods: {
     dragstart(event, item) {
@@ -644,20 +668,16 @@ export default {
         // console.log("111111111")
         // console.log(that.scheduleZone)
       })
-    },changeSch(val){
+    },
+    changeSch(val){
       // console.log(this.partitions)
       // console.log(this.scheduleZoneRow)
       // console.log(this.scheduleZone)
 
-
-
-    },changeWeekType(val){
-
-
-
-    },changeZone(val){
-
-
+    },
+    changeWeekType(val){
+    },
+    changeZone(val){
     },
     setScheduleTemplateAction: function () {
       this.$router.push({path: '/workforce/template'})
@@ -665,7 +685,8 @@ export default {
     export_file: function () {
       // this.getWeekPanelsTwo()
       this.export_file_step_two()
-    },export_file_step_two: function(){
+    },
+    export_file_step_two: function(){
 
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {
@@ -2871,16 +2892,23 @@ export default {
 
     getTime(val) {
       return uParseTime(val, '{y}-{m}-{d}')
-    }, smartsch(){
+    },
+     smartsch(){
       this.$nextTick(function() {
         this.$refs.edittableData.showSmartDialog()
       })
-    },editsch() {
+    },
+    editsch() {
       this.is_edit = true
-      this.$nextTick(function() {
+      this.schedulingTableVisible=true
+      this.$nextTick(function() {//, this.days,this.zones
         this.$refs.edittableData.setEditData(this.patientList, this.$store.getters.treatment_mode, this.days,this.zones)
       })
     },
+    outisedit(){
+      this.is_edit=false
+      this.schedulingTableVisible=false
+    },
     copySchedule() {
       this.newVisible = true
     },
@@ -3006,7 +3034,8 @@ export default {
           this.templateObj = template
         }
       })
-    },getPatientList(){
+    },
+    getPatientList(){
       patientLists().then(response => {
         if (response.data.state == 1) {
           var patientList = response.data.data.list

src/xt_pages/workforce/components/ScheduleItem.vue

@@ -1,11 +1,11 @@
 <template>
+  <!-- 排班表填充内容 -->
     <div >
 
             <div>
                 <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span><br/>
                 <span v-if="scheduleDetail.mode_name.length>0" :class='modeColor(scheduleDetail.mode_name)'>({{scheduleDetail.mode_name}})</span>
-              <span >{{scheduleDetail.dialysis_machine_name}}</span>
-
+              <span v-if="schedulFlag">{{scheduleDetail.dialysis_machine_name}}</span>
             </div>
     </div>
 </template>
@@ -26,8 +26,16 @@ export default {
               }
           },
       },
+      schedulFlag:{
+        type:Boolean,
+        default:false
+      }
+  },
+  data() {
+    return {
+      schedul:false
+    }
   },
-
 
   methods:{
         modeColor(name){
@@ -45,7 +53,7 @@ export default {
 
 <style lang="scss" scoped>
 .modeRed{
-  color:#ed5555;
+  color:#ee780a;
 }
 .modePurple{
   color: #53b86e;

src/xt_pages/workforce/components/template_table.vue

@@ -27,7 +27,7 @@
           <div style="margin-bottom: 10px; display: flex">
             <h3 style="line-height: 45px">
               <span
-                style="margin-right: 30px; font-size: 16px; white-space: nowrap"
+                style="margin-right: 15px; font-size: 16px; white-space: nowrap"
               >当前选择</span
               >
             </h3>
@@ -71,7 +71,7 @@
                     <el-table-column
                       prop="name"
                       label="患者名称"
-                      width="104"
+                      
                       align="center"
                     >
                     </el-table-column>
@@ -92,7 +92,7 @@
                     <el-table-column
                       prop="name"
                       label="透析模式"
-                      width="104"
+
                       align="center"
                     ></el-table-column>
                   </el-table>
@@ -102,22 +102,8 @@
           </div>
         </div>
         <div class="right_contain">
-          <!--          <span>分区：</span>-->
-          <!--          <el-select-->
-          <!--              v-model="partition_id"-->
-          <!--              multiple-->
-          <!--              placeholder="请选择"-->
-          <!--              @change="changePartiton"-->
-          <!--          >-->
-          <!--            <el-option-->
-          <!--                v-for="item in this.all_zones"-->
-          <!--                :key="item.id"-->
-          <!--                :label="item.name"-->
-          <!--                :value="item.id"-->
-          <!--            >-->
-          <!--            </el-option>-->
-          <!--          </el-select>-->
           <el-table
+            :fit="true"
             :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
             ref="table"
             :data="opera_device_numbers"
@@ -125,32 +111,31 @@
             show-summary
             height="675"
             style="width: 100%; cursor: pointer"
-
-            :summary-method="getSummaries"
             row-class-name="table-row-new-class schedule-table-row"
+            :summary-method="getSummaries"
             @cell-click="itemClick"
             sum-text="总数"
           >
+          <!--   -->
             <el-table-column
               label="分区"
-              width="80"
+              min-width="50"
               align="center"
               fixed
-              style="width: 100px; background-color: red; display: block"
             >
               <template slot-scope="scope">
                 {{ scope.row.zone.name }}
               </template>
             </el-table-column>
 
-            <el-table-column label="机号" width="80" align="center" fixed>
+            <el-table-column label="机号" min-width="40" align="center" fixed>
               <template slot-scope="scope">
                 <div>{{ scope.row.number }}</div>
               </template>
             </el-table-column>
 
-            <el-table-column label="周一" width="335" align="center">
-              <el-table-column prop="1_1" label="上" width="110" align="center">
+            <el-table-column label="周一"  align="center">
+              <el-table-column prop="1_1" label="上" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -187,7 +172,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="1_2" label="下" width="110" align="center">
+              <el-table-column prop="1_2" label="下" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -224,7 +209,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="1_3" label="晚" width="110" align="center">
+              <el-table-column prop="1_3" label="晚" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -263,8 +248,8 @@
               </el-table-column>
             </el-table-column>
 
-            <el-table-column label="周二" width="335" align="center">
-              <el-table-column prop="2_1" label="上" width="110" align="center">
+            <el-table-column label="周二"  align="center">
+              <el-table-column prop="2_1" label="上" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -300,7 +285,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="2_2" label="下" width="110" align="center">
+              <el-table-column prop="2_2" label="下" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -337,7 +322,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="2_3" label="晚" width="110" align="center">
+              <el-table-column prop="2_3" label="晚" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -376,8 +361,8 @@
               </el-table-column>
             </el-table-column>
 
-            <el-table-column label="周三" width="335" align="center">
-              <el-table-column prop="3_1" label="上" width="110" align="center">
+            <el-table-column label="周三"  align="center">
+              <el-table-column prop="3_1" label="上" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -414,7 +399,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="3_2" label="下" width="110" align="center">
+              <el-table-column prop="3_2" label="下" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -451,7 +436,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="3_3" label="晚" width="110" align="center">
+              <el-table-column prop="3_3" label="晚" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -490,8 +475,8 @@
               </el-table-column>
             </el-table-column>
 
-            <el-table-column label="周四" width="335" align="center">
-              <el-table-column prop="4_1" label="上" width="110" align="center">
+            <el-table-column label="周四"  align="center">
+              <el-table-column prop="4_1" label="上" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -528,7 +513,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="4_2" label="下" width="110" align="center">
+              <el-table-column prop="4_2" label="下" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -565,7 +550,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="4_3" label="晚" width="110" align="center">
+              <el-table-column prop="4_3" label="晚" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -604,8 +589,8 @@
               </el-table-column>
             </el-table-column>
 
-            <el-table-column label="周五" width="335" align="center">
-              <el-table-column prop="5_1" label="上" width="110" align="center">
+            <el-table-column label="周五" align="center">
+              <el-table-column prop="5_1" label="上" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -642,7 +627,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="5_2" label="下" width="110" align="center">
+              <el-table-column prop="5_2" label="下" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -679,7 +664,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="5_3" label="晚" width="110" align="center">
+              <el-table-column prop="5_3" label="晚" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -718,8 +703,8 @@
               </el-table-column>
             </el-table-column>
 
-            <el-table-column label="周六" width="335" align="center">
-              <el-table-column prop="6_1" label="上" width="110" align="center">
+            <el-table-column label="周六"  align="center">
+              <el-table-column prop="6_1" label="上" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -756,7 +741,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="6_2" label="下" width="110" align="center">
+              <el-table-column prop="6_2" label="下" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -793,7 +778,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="6_3" label="晚" width="110" align="center">
+              <el-table-column prop="6_3" label="晚" min-width="40" align="center">
                 <template slot-scope="scope">
                   <div class="del_table_btn">
                     <el-button
@@ -832,11 +817,11 @@
               </el-table-column>
             </el-table-column>
 
-            <el-table-column label="周日" min-width="335" align="center">
+            <el-table-column label="周日" align="center">
               <el-table-column
                 prop="7_1"
                 label="上"
-                min-width="110"
+                min-width="40"
                 align="center"
               >
                 <template slot-scope="scope">
@@ -878,7 +863,7 @@
               <el-table-column
                 prop="7_2"
                 label="下"
-                min-width="110"
+                min-width="40"
                 align="center"
               >
                 <template slot-scope="scope">
@@ -920,7 +905,7 @@
               <el-table-column
                 prop="7_3"
                 label="晚"
-                min-width="110"
+                min-width="40"
                 align="center"
               >
                 <template slot-scope="scope">
@@ -961,7 +946,7 @@
               </el-table-column>
             </el-table-column>
 
-            <el-table-column
+            <!-- <el-table-column
               prop="total"
               label="总数"
               width="60"
@@ -971,7 +956,7 @@
               <template slot-scope="scope">
                 {{ scope.row.total }}
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
         </div>
       </div>
@@ -1349,7 +1334,7 @@ export default {
 
       partition_id: 0,
       tableHeight: document.documentElement.clientHeight,
-      template:null,
+      template:0,
       all_template:[],
       active_name:"first",
     };
@@ -2093,9 +2078,11 @@ export default {
       console.log("saveData")
       console.log(tempData)
       this.$emit("saveData", tempData,delData);
-    },changeJihao(){
+    },
+    changeJihao(){
       this.$forceUpdate()
-    },changeSchMachine(row) {
+    },
+    changeSchMachine(row) {
       let params = {
         zone_id: row.zone_id,
         sch_type: row.time_type,
@@ -2364,7 +2351,8 @@ export default {
 
       }
 
-    },    deepClone(source) {
+    }, 
+    deepClone(source) {
       if (!source && typeof source !== 'object') {
         throw new Error('error arguments', 'shallowClone')
       }
@@ -2576,7 +2564,8 @@ export default {
 
       }, 1000);
 
-    },curInfoDragStart(){
+    },
+    curInfoDragStart(){
       this.cur_drag_obj = 1
       this.cur_drag_info.patient_id = this.cur_info.patient_id
       this.cur_drag_info.patient_name = this.cur_info.patient_name
@@ -2803,7 +2792,8 @@ export default {
       this.all_zones = this.unique_two(this.all_zones);
 
       return maked_device_numbers;
-    },   coverSch(){
+    },  
+    coverSch(){
       let params={
         template_id:this.template.id,
         week_type_one:this.cur_drag_info.schedule_week,
@@ -2923,7 +2913,8 @@ export default {
           };
         }
       }
-    }, search_two: function () {
+    }, 
+    search_two: function () {
       if (this.keywords.length == 0) {
         this.patients = this.all_patients;
       } else {
@@ -2989,6 +2980,21 @@ export default {
       // else {
       //   this.$refs.selector_dialog.showWith(item.pid, item.treat_mode_id, weekday, time_type, device_number_id)
       // }
+      // console.log('row[column.property]',row[column.property]);
+      //   if (row[column.property].schedule_id > 0) {
+      //     let patient_id = row[column.property].patient_id
+      //       this.patient_id_hover = patient_id;
+      //   } else {
+      //     this.patient_id_hover = -1;
+      //     this.currentData.mode_id = 1;
+      //     this.currentData.id = 0;
+      //     this.currentData.patient_id = 0;
+      //     this.currentData.patient = "";
+      //     this.currentData.contagions = [];
+      //     this.getSchedulePatients();
+      //     this.dialogTableVisible = true;
+          
+      //   }
     },
     will_add_schedule_actionTwo: function (
       patient_id,
@@ -3351,7 +3357,8 @@ export default {
         this.data.push(obj);
         this.$refs.selector_dialog.hide();
       }
-    },    saveActionFour: function () {
+    }, 
+    saveActionFour: function () {
       var add_items = [];
       var del_items = [];
       var change_items = [];
@@ -3756,32 +3763,50 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-// /deep/ .el-dialog__wrapper {
-//   .el-dialog {
-     //     background: red;
-//     .el-dialog__header {
-       //       color: #fff;
-       //       background-color: #409eff !important;
-       //       border-color: #409eff;
-       //     }
-//   }
-// }
 .table_contain {
   display: flex;
 
 .left_contain {
-  width: 230px;
+  width: 14%;
   margin-right: 15px;
+  .item{
+    width: 115px;
+    padding: 6px 5px;
+    margin: 0px 5px ;
+    // border: solid 1px #eee;
+    text-align: left;
+  }
 }
 
 .right_contain {
-  width: 84%;
+  width: 86%;
+  .el-table{
+    padding: 0 !important;
+  }
+  .del_table_btn{
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    // visibility: hidden;
+    .el-button {
+      width: 15px;
+      height: 15px;
+      padding: 0px;
+    }
+  }
 }
+
+// .el-table th .cell, .el-table td .cell {
+//     margin: 0;
+//     padding: 0 0px;
+// }
+// .el-table--medium td, .el-table--medium th {
+//     padding: 5px 0 !important;
+// }
 }
 .schedule-table-row {
   background: #fff !important;
 }
-
 .schedule-table-row:hover {
   background: #fff !important;
 }
@@ -3796,7 +3821,7 @@ export default {
 }
 
 #table_data {
-  /*min-height: calc(100vh - 350px);*/
+  min-height: calc(100vh - 350px);
 }
 
 #table_data ::-webkit-scrollbar {
@@ -3823,27 +3848,27 @@ export default {
 }
 }
 
-#table_data {
-  min-height: calc(100vh - 350px);
-}
+// #table_data {
+//   min-height: calc(100vh - 350px);
+// }
 
 #table_data ::-webkit-scrollbar {
   height: 15px;
 }
 
-.del_table_btn {
-  position: absolute;
-  right: 0px;
-  top: -3px;
-  z-index: 999;
-  visibility: hidden;
-
-.el-button {
-  width: 15px;
-  height: 15px;
-  padding: 0px;
-}
-}
+// .del_table_btn {
+//   position: absolute;
+//   right: 0px;
+//   top: -3px;
+//   z-index: 999;
+//   visibility: hidden;
+
+// .el-button {
+//   width: 15px;
+//   height: 15px;
+//   padding: 0px;
+// }
+// }
 
 #table_data {
   min-height: calc(100vh - 350px);
@@ -3898,7 +3923,7 @@ export default {
 }
 }
 
-.el-dialog__header {
-  padding: 0 !important;
-}
+// .el-dialog__header {
+//   padding: 0 !important;
+// }
 </style>