Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/App.vue

 body .el-table th.gutter {
   display: table-cell !important;
 }
-*{  
-   -webkit-touch-callout:none;  /*系统默认菜单被禁用*/   
-   -webkit-user-select:none; /*webkit浏览器*/   
-   -khtml-user-select:none; /*早期浏览器*/   
-   -moz-user-select:none;/*火狐*/   
-   -ms-user-select:none; /*IE10*/   
-   user-select:none;   
-} 
-input{  
- -webkit-user-select:auto; /*webkit浏览器*/     
-}
-textarea{
- -webkit-user-select:auto; /*webkit浏览器*/
-}
+
 </style>

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

           </el-input>
         </el-form-item>
       </el-form>
+      <!-- 六次干体重调整记录 -->
+      <!-- <div  style="margin: 10px 50px;"><span style="font-weight: bold;">近六次干体重调整记录</span></div>
+      <div class="gantizhong">
+        <el-table
+          :data="tableData"
+          stripe
+          style="width: 100%">
+          <el-table-column
+            prop=""
+            label="时间"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop=""
+            label="干体重"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop=""
+            label="医生"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop=""
+            label="备注">
+          </el-table-column>
+        </el-table>
+      </div> -->
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancleDryWeight()">取 消</el-button>
         <el-button type="primary" @click="submitDryWeight()">保 存</el-button>
     margin-bottom: 10px;
     color:#fff;
   }
+  .gantizhong{
+    text-align: center;
+  }
 </style>
 <style lang="scss">
   .newDialog{

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

                       <div class="under_line" style="width: 80px">
                         <!-- <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="" /> -->
 
-                        <span v-if="setAdminUserES(prescription.prescription_doctor) == ''">{{ getAdminUser(prescription.prescription_doctor) }}</span>
-                        <img style="height:20px;" :src="setAdminUserES(prescription.prescription_doctor)" alt="" srcset="" v-else />
+                        <span v-if="setAdminUserES(prescription.creater) == ''">{{ getAdminUser(prescription.creater) }}</span>
+                        <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else />
                       </div>
                     </div>
                     <div class="inline_block" style="flex:1;">

src/xt_pages/outpatientCharges/statementTemplate/printTen.vue

               <td colspan="2" style="border: 1px solid gray;width: 150px;height: 30px;">{{info.hosp_part_amt}}</td>
             </tr>
           </table>
-          <div style="width: 51%; margin: 5px 90px; text-align: left;">
+          <div style="width: 51%; margin: 5px 100px; text-align: center;">
            <span style="display: inline-block;"> 备注：其它包含军转、财政、慈善、其他商报等支付来源</span>
           </div>
         </div>
   margin-bottom: 20px;
   padding: 20px 10px;
 }
-// *{
-//   padding:0;
-//   margin: 0;
-//   border: 0;
-// }
-// .print-content{
-//   display: flex;
-//   justify-content: center;
-//   flex-direction:column
-// }
-// h1{
-//   text-align: center;
-// }
-// .yiliao{
-//   display: inline-block;
-//   margin: 10px 80px 10px 0px ;
-// }
-// .print-tab{
-//   margin: 0px auto;
-// }
-// .jiesuan{
-//   border-collapse: collapse;
-//   text-align: center;
-// }
-// .jiesuan tr td{
-//   border: 1px solid gray;
-//   width: 150px;
-//   height: 30px;
-// }
-
 
 </style>

src/xt_pages/stock/inventoryDetails.vue

 
             <el-table-column  prop="name" label="有效日期" width="200" align="center">
                <template slot-scope="scope">
-                 {{getTime(scope.row.product_date)}}
+                 {{getTime(scope.row.expire_date)}}
                </template>
             </el-table-column>
 

src/xt_pages/user/hospitalSummaryPrint.vue

               </span>
               </span>
             </td>
+            <td  style="text-align:center;width:170px" colspan="2"></td>
           </tr>
         </table>
      </div>

src/xt_pages/workforce/appointment.vue

     changeZone(val){
     },
     setScheduleTemplateAction: function () {
+      this.schedulingTableVisible=true
       this.$router.push({path: '/workforce/template'})
     },
     export_file: function () {
           break
       }
 
-    }, getDateByResultsStr(key) {
+    }, 
+    getDateByResultsStr(key) {
 
       switch (key) {
         case '周一' + "(" + this.days[0] + ")" : //本周一

src/xt_pages/workforce/components/editTableData.vue

     async CreateSchedule(id, data) {
       this.creating_schedule = true;
       let response =await CreateSchedule(id, data)
-
+      this.dialogTableVisible=false
       if (response.data.state == 0) {
         this.$message.error(response.data.msg);
       } else {
         )
             .then(() => {
               this.CreateSchedule(this.currentData.patient_id, this.currentData);
+              
             })
-            .catch(() => {});
+            .catch(() => {
+              this.dialogTableVisible=false
+            });
       } else {
         this.CreateSchedule(this.currentData.patient_id, this.currentData);
       }

src/xt_pages/workforce/components/template_table.vue

 <template>
-  <div>
-    <div id="table_data">
+  <div  >
+    <div id="tem_table_data" v-show="schedulingTableVisible">
+      <slot></slot>
       <div class="table_contain">
         <div class="left_contain">
           <div
   },
   data() {
     return {
+      schedulingTableVisible:true,//全屏
       changeLoadingOne:false,
       changeLoadingTwo:false,
       tipDialogVisibleTwo:false,
       }
 
       this.$message.error("设备不存在");
-    },  will_add_schedule_action_four: function(patient_id, treat_mode, weekday, time_type, device_number_id) {
+    }, 
+     will_add_schedule_action_four: function(patient_id, treat_mode, weekday, time_type, device_number_id) {
       var patient = null
       for (let index = 0; index < this.patients.length; index++) {
         const p = this.patients[index]
 <style lang="scss">
 .table_contain {
   display: flex;
+  margin-top: 30px;
 .left_contain {
   width: 14%;
   margin-right: 50px;
   white-space: normal !important;
 }
 
-#table_data {
+#tem_table_data {
   /*min-height: calc(100vh - 350px);*/
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  overflow: auto;
+  margin: 0;
+  background: #fff;
+  padding: 20px;
+  z-index:2000;
+  height: 100%;
 }
 
-#table_data ::-webkit-scrollbar {
+#tem_table_data ::-webkit-scrollbar {
   height: 15px;
 }
 
-#table_data {
+#tem_table_data {
 .el-table__body tr.current-row > td {
   background-color: #ecf5ff !important;
   color: #3a8ee6;
 //   min-height: calc(100vh - 350px);
 // }
 
-#table_data ::-webkit-scrollbar {
+#tem_table_data ::-webkit-scrollbar {
   height: 15px;
 }
 
 // }
 // }
 
-#table_data {
+#tem_table_data {
   min-height: calc(100vh - 350px);
 }
 
-#table_data ::-webkit-scrollbar {
+#tem_table_data ::-webkit-scrollbar {
   height: 15px;
 }
 

src/xt_pages/workforce/template.vue

       <!-- </el-col> -->
     </div>
     <div class="app-container">
-      <el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick">
+      
+      <!-- <el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick"> -->
 <!--        <el-tab-pane name="schedules">-->
 <!--          <span slot="label"> 排班信息 </span>-->
 <!--          <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" >
+        <!-- <el-tab-pane name="first" :disabled="template_mode.mode == 0" > -->
 <!--          <span slot="label">-->
 <!--          </span>-->
-          <span slot="label"> {{first_template.week?'一周模版':'一周模版'}}
+          <!-- <span slot="label"> {{first_template.week?'一周模版':'一周模版'}} -->
 <!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>-->
 <!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>-->
 
-             <span v-if="schedule.mode ==1">(本周)</span>
+             <!-- <span v-if="schedule.mode ==1">(本周)</span>
              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
              <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
           </span>
 
         </el-tab-pane>
 
-        <el-tab-pane  name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
+        <el-tab-pane  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>-->
-          <span slot="label"> {{second_template.week?'二周模版':'二周模版'}}
+          <!-- <span slot="label"> {{second_template.week?'二周模版':'二周模版'}} -->
 <!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>-->
 <!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>-->
 <!--            -->
-              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
+              <!-- <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
              <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
           </span>
-        </el-tab-pane>
+        </el-tab-pane> -->
 
 
 
-        <el-tab-pane :label="  third_template.week? '三周模版':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
+        <!-- <el-tab-pane :label="  third_template.week? '三周模版':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4"> -->
 
 <!--          <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> -->
 
-      <el-tab-pane :label="four_template.week?'四周模版':'四周模版'" name="four" :disabled="template_mode.mode  != 4 ">
+      <!-- <el-tab-pane :label="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>-->
 <!--        <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>
+        <!-- </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" :data="data" @cancel_sch="refresh"  :template_mode="template_mode" @saveSuccess="refresh" @cur_info="cur_info" @saveData="saveData"   @saveSuccessTwo="refresh"></template-table-four>-->
 
 
-      </el-tabs>
+      <!-- </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>
+                        :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">
+            <div class="position">
+              <div>
+                <el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick">
+
+        <el-tab-pane name="first" :disabled="template_mode.mode == 0" >
+
+          <span slot="label"> {{first_template.week?'一周模版':'一周模版'}}
+
+             <span v-if="schedule.mode ==1">(本周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
+          </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?'二周模版':'二周模版'}}
+
+              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
+          </span>
+        </el-tab-pane>
+
+        <el-tab-pane :label="  third_template.week? '三周模版':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
+
+        </el-tab-pane>
+
+      <el-tab-pane :label="four_template.week?'四周模版':'四周模版'" name="four" :disabled="template_mode.mode  != 4 ">
+        </el-tab-pane>
+      </el-tabs>
+              </div>
+              <div style="display:flex;align-items:center">
+
+                <!--<upload-excel style="float:right;" :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>-->
+                <schedule-template-upload-excel style="margin-right:10px;"
+                                                :on-success='handleSuccess'></schedule-template-upload-excel>
+
+                <!-- <el-col :span="3" style="text-align: right;"> -->
+                <el-button v-loading="downloadLoading" v-if="template_mode"
+                          size="small" icon="el-icon-setting" type="primary" @click="import_file()">下载模版
+                </el-button>
+                <el-button size="small" icon="el-icon-setting" type="primary" @click="setData" v-if="template_mode.mode>0">同步数据</el-button>
+                <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置</el-button>
+
+                <el-button size="small" icon="el-icon-setting" type="primary" @click="editClick">智能排班</el-button>
+                <el-button size="small" icon="el-icon-setting" type="primary" @click="saveClick">保存并退出</el-button>
+
+                <el-button
+                    @click="generateLog()"
+                    class="filter-item"
+                    type="primary"
+                    size="small"
+                    v-loading="generateLoading"
+                >下载日志
+                </el-button>
+              </div>
+            </div>
+      </template-table>
 
 
 <!--      <template-table  ref="table" :editable="true" :device_numbers="device_numbers" :template="tar_template" :is_editing="is_editing"-->
   },
   data: function () {
     return {
+      schedulingTableVisible:false,
       dataloading:true,
       is_editing:true,
       editable:false,
 
       }
 
-    },getInitData(){
+    },
+    getInitData(){
       let params = {
         patitionid:""
       }
 
       }
 
-    },changeZone(val){
+    },
+    changeZone(val){
       this.getWeekPanels(val)
       let params = {
         patitionid:val
       })
 
 
-    },saveData(val,del_data){
+    },
+    saveData(val,del_data){
       var tempDataOne = []
       for(let i = 0; i < val.length; i++){
           tempDataOne.push(val[i])
           })
         }
       })
-    },editClick:function (){
+    },
+    editClick:function (){
       this.$nextTick(function() {
         if(this.activeName == "first"){
           this.activeName = "first"
         }
       })
 
-    },saveClick:function (){
+    },
+    // 退出排班模板
+    saveClick:function (){
       if(this.template_mode.mode == 0){
         // this.$router.go(-1)
         this.$router.back()
 
       }else{
+        this.schedulingTableVisible=false
         this.$message.success("保存成功")
         this.$router.back()
-
+        
       }
 
     },