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

src/router/modules/workforce.js

@@ -200,6 +200,18 @@ export default {
       noCache: true
     }
   },
+
+  {
+    path: '/scheduleTablePrintFive',
+    component: () => import('@/xt_pages/workforce/scheduleTablePrintFive'),
+    name: 'scheduleTablePrintFive',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'scheduleTablePrintFive',
+      noCache: true
+    }
+  },
   // {
   //   path: '/historyWeekTable',
   //   component: () => import('@/xt_pages/workforce/historyWeekTable'),

src/xt_pages/data/printTemplate/schedulePrint.vue

@@ -1,38 +1,39 @@
 <template>
+  <div>
     <div
       v-loading="loading"
       element-loading-text="服务器处理数据中，请稍候......."
       element-loading-spinner="el-icon-loading"
       element-loading-background="rgba(0, 0, 0, 0.8)"
     >
-    <p style="margin-top: 10px;margin-bottom: 30px">
-        请选择你需要打印的排班打印单样式
-    </p>
-    <el-row :gutter="20" type="flex" justify="center">
+      <p style="margin-top: 10px;margin-bottom: 30px">
+          请选择你需要打印的排班打印单样式
+      </p>
+      <el-row :gutter="20" type="flex" justify="center">
         <el-col :span="6" style="text-align: center">
-        <div
-            @click="imgClick('https://kuyi.shengws.com/tempSchedule1.jpg')"
-        >
-            <el-tooltip
-            class="item"
-            effect="dark"
-            :hide-after="2000"
-            content="点击查看大图"
-            placement="top-start"
-            >
-         
-            <el-image
-                style="width: 200px; height: 200px"
-                :src="require('@/assets/home/111.jpg')"
-            ></el-image>
+          <div
+              @click="imgClick('https://kuyi.shengws.com/tempSchedule1.jpg')"
+          >
+              <el-tooltip
+              class="item"
+              effect="dark"
+              :hide-after="2000"
+              content="点击查看大图"
+              placement="top-start"
+              >
+            
+              <el-image
+                  style="width: 200px; height: 200px"
+                  :src="require('@/assets/home/111.jpg')"
+              ></el-image>
 
-            </el-tooltip>
-        </div>
+              </el-tooltip>
+          </div>
         <el-radio v-model="radio" label="1" @change="change">模版一</el-radio>
         </el-col>
         <el-col
         :span="6"
-        style="margin-left: 100px;margin-right: 100px;text-align: center"
+        style="margin-left: 50px;margin-right: 50px;text-align: center"
         >
         <div
             @click="imgClick('https://kuyi.shengws.com/tempSchedule2.jpg')"
@@ -57,9 +58,9 @@
         >
         </el-col>
 
-       <el-col
+        <el-col
         :span="6"
-        style="margin-left: 100px;margin-right: 100px;text-align: center"
+        style="margin-right: 50px;text-align: center"
         >
         <div
           @click="imgClick('https://kuyi.shengws.com/tempSchedule2.jpg')"
@@ -81,31 +82,54 @@
         >
         </el-col>
 
-      
-
-       <el-col
-        :span="6"
-        style="margin-left: 100px;margin-right: 100px;text-align: center"
-        >
-        <div
-          @click="imgClick('https://kuyi.shengws.com/tempSchedule2.jpg')"
-        >
-            <el-tooltip
-            class="item"
-            effect="dark"
-            content="点击查看大图"
-            placement="top-start"
-            :hide-after="2000"
-            >
-            <el-image
-                style="width: 200px; height: 200px"
-                :src="require('@/assets/home/222.jpg')"
-            ></el-image>
-            </el-tooltip>
-        </div>
-        <el-radio v-model="radio" label="4" @change="change">模版四</el-radio>
+        <el-col
+          :span="6"
+          style="text-align: center"
+          >
+          <!-- margin-left: 100px;margin-right: 100px; -->
+          <div
+            @click="imgClick('https://kuyi.shengws.com/tempSchedule2.jpg')"
+          >
+              <el-tooltip
+              class="item"
+              effect="dark"
+              content="点击查看大图"
+              placement="top-start"
+              :hide-after="2000"
+              >
+              <el-image
+                  style="width: 200px; height: 200px"
+                  :src="require('@/assets/home/222.jpg')"
+              ></el-image>
+              </el-tooltip>
+          </div>
+          <el-radio v-model="radio" label="4" @change="change">模版四</el-radio>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col
+          :span="6"
+          style="text-align: center"
+          >
+          <div
+            @click="imgClick('https://kuyi.shengws.com/tempSchedule2.jpg')"
+          >
+              <el-tooltip
+              class="item"
+              effect="dark"
+              content="点击查看大图"
+              placement="top-start"
+              :hide-after="2000"
+              >
+              <el-image
+                  style="width: 200px; height: 200px"
+                  :src="require('@/assets/home/222.jpg')"
+              ></el-image>
+              </el-tooltip>
+          </div>
+          <el-radio v-model="radio" label="5" @change="change">模版五</el-radio>
         </el-col>
-    </el-row>
+      </el-row>
    
       <el-image-viewer
         v-if="showViewer"

src/xt_pages/user/Informed/Informedconsent.vue

@@ -1,10 +1,10 @@
 <!-- 文书管理 -->
 <template>
   <div class="patient-container">
-    <patient-sidebar :id="patient_id" defaultActive="6-1"></patient-sidebar>
+    <patient-sidebar :id="patientID" defaultActive="6-1"></patient-sidebar>
     <div>
       <div class="patient-app-container advice-container app-container">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tabs v-model="activeName" >
           <el-tab-pane label="已生成" name="first">
             <div style="display: flex;">
               <div style="width: 30%;">
@@ -77,7 +77,7 @@
                       prop="date"
                       label="知情同意书模板"
                       align="center"
-                      >
+                    >
                     </el-table-column>
                   </el-table>
                 </div>
@@ -165,7 +165,7 @@ export default {
   },
   data() {
     return {
-      patient_id:0,
+      // patient_id:0,
       activeName:'first',
       templates:[{date:'人脸识别知情同意书',value:1},{date:'血液透析(滤过、灌流)治疗知情同意书',value:2},{date:'深静脉透析导管拔管术知情同意书',value:3},{date:'动静脉内瘘穿刺知情同意书',value:4},
                 {date:'高危出血患者血液净化抗凝方式选择知情同意书',value:5},{date:'抗凝溶栓治疗知情同意书',value:6},{date:'危重患者接受血液净化治疗知情同意书',value:7},
@@ -187,6 +187,7 @@ export default {
       patientID:0,
       patient:{},
       tableData:[],
+      input2:'',
     }
 
   },
@@ -194,11 +195,12 @@ export default {
     const id = this.$route.params && this.$route.params.id
     this.patientID = parseInt(id)
     console.log("病人id",this.patientID)
+    // this.queryParams.patient_id = this.patientID;
   },
   methods: {
     getlist(){
     
-    getPatientDetailInformedconsent(this.patient_id).then(response=>{
+    getPatientDetailInformedconsent(this.patientID).then(response=>{
       if(response.data.state == 1){
         var patient =  response.data.data.patients
         console.log("patinet",patient)

src/xt_pages/workforce/appointment.vue

@@ -983,7 +983,10 @@ export default {
       if(this.templateObj.template_id == 4){
         this.$router.push({path: '/scheduleTablePrintTwo?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date+"&schedule_type="+this.schedule_type})
       }
-// +"&schedule_type"+
+      if(this.templateObj.template_id == 5){
+        this.$router.push({path: '/scheduleTablePrintFive?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date+"&schedule_type="+this.schedule_type})
+      }
+// +"&schedule_type"+scheduleTablePrintFive
     },
     printScheduleActionOne:function(){
 
@@ -2664,7 +2667,7 @@ export default {
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 1) {
                     // console.log(week[j].name)
                     list[i].shangwu = week[j].name+" "+week[j].dialysis_machine_name
-                    console.log('eeeeeee',list[i])
+                    console.log('eeeeeee',week[j].mode_id)
                   }
                   // 周一下午
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 2) {
@@ -2678,6 +2681,7 @@ export default {
                   //周二上午
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 1) {
                     list[i].shangwu1 = week[j].name+" "+week[j].dialysis_machine_name
+                    console.log('eeeeeee',week[j].mode_id)
                   }
                   //周二下午
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 2) {

src/xt_pages/workforce/components/scheduleTemplateUploadExcel/index.vue

@@ -14,6 +14,7 @@
 
     <el-dialog
       :visible.sync="msgTipVisible"
+      :modal-append-to-body='false'
       width="40%"
     >
       <span>若执行排班导入,系统将会清除当前已有排班模板数据,是否继续导入？</span>

src/xt_pages/workforce/components/template_table.vue

@@ -4062,7 +4062,7 @@ export default {
 
       for(let j in data){
         if(data[j].hasOwnProperty ('2_3') == true){
-          Tue_N.push(data[j]['2_2'].treat_mode)
+          Tue_N.push(data[j]['2_3'].treat_mode)
           Tue_N=Tue_N.filter(item=> item && item.trim())
           var countNum =Tue_N.reduce((obj,name)=>{
             if(name in obj){

src/xt_pages/workforce/template.vue

@@ -57,6 +57,7 @@
     <el-dialog
         title="提示"
         :visible.sync="msgTipVisible"
+        :modal-append-to-body="false"
         width="40%"
     >
       <span>如果导入成功,会将当前已有的排版会被全部清除,是否继续导入排版数据</span>