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

src/xt_pages/outpatientTool/components/detail.vue

@@ -389,7 +389,11 @@
                   // new_name = new_name.replace('（ ', '')
                   // new_name = new_name.replace(' ）', '')
                   if (new_name.length != 0) {
-                    total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString().toString())).toFixed(2))
+                    console.log(tempPatientsTwo[i].new_order_info[b].count)
+                    console.log(tempPatientsTwo[i].new_order_info[b].price)
+                    console.log(parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price))
+                    console.log(total)
+                    total = total + parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toFixed(2))
                   }
 
 

src/xt_pages/workforce/appointment.vue

@@ -130,7 +130,7 @@
                         :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>
@@ -161,7 +161,7 @@
               type="primary"
               v-if="is_edit"
               size="small"
-          >下载日志 
+          >下载日志
           </el-button>
           <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
           </el-button>
@@ -172,11 +172,10 @@
         </div>
       </div>
         </edit-table-data>
-       
+
         <HistoryWeekTable v-show="showtable" ref="tableDataZero"  :week-time="activeName" partitions-prop="partitions"
                   :schedule-zone-row-prop="scheduleZoneRow"
-                  :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
-                  @event2="changeSchedule"  @event3="changeWeekDay">
+                  :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">
@@ -286,7 +285,7 @@ export default {
         nextWeek: 0,
         nextTwoWeek: 0
       },
-      
+
       tableList: [],
       weekTime: "",
       schedule_type: 0,
@@ -334,7 +333,8 @@ export default {
         this.showtable=true
         this.showtableOne=false
         this.$nextTick(() => {
-          this.$refs.tableDataZero.getAllZones()
+
+          this.$refs.tableDataZero.start()
         })
         console.log('12343545',this.$refs.tableDataZero);
       }else{
@@ -342,10 +342,6 @@ export default {
         this.showtableOne=true
       }
 
-      // if(e.name == 'thisWeek'){
-      //    this.$refs.tableData.getWeekPanels()
-      // }
-      // console.log(getgetSchedules);
     },
     dragstart(event, item) {
       // console.log('start的索引',item.moveIndex)
@@ -440,13 +436,12 @@ export default {
         this.theWeek.lastWeek = response.data.data.theLastWeek
         this.theWeek.nextWeek = response.data.data.theNextWeek
         this.theWeek.nextTwoWeek = response.data.data.theNextSecWeek
-        // this.theWeek.historyWeek = response.data.data.theWeek - 2
+        this.theWeek.historyWeek = response.data.data.theWeek - 2
         // 在控制变量改变的时候进行 强制渲染更新
         let childrenRefs = this.$refs.elTabs.$children
         this.$nextTick(() => {
           childrenRefs.forEach(child => child.$forceUpdate())
         })
-
         var that = this
 
         if (partitions.length > 0) {
@@ -2365,7 +2360,7 @@ export default {
 
       return next_monday
     },
-    // 
+    //
     getThreeWeekList() {
       var params = {
         start_time: this.start_time,
@@ -3070,7 +3065,7 @@ export default {
     },
     getlist() {
       getScheduleTemplate().then(response => {
-        
+
         if (response.data.state == 1) {
           var template = response.data.data.template
           console.log('12243254',response.data.data);

src/xt_pages/workforce/components/editTableData.vue

@@ -5663,7 +5663,7 @@ export default {
       this.$emit("event1", val);
       this.partition_id = val;
       this.getWeekPanels();
-      // this.getSchedules();
+      this.getSchedules();
     },
     changeSchedule_type(val) {
       this.$emit("event2", val);
@@ -5774,9 +5774,9 @@ textarea{
     padding: 0 0px ;
 
 }
-//  .el-table td .cell:hover {
-//   background: #22eeddc4 !important;
-// }
+.el-table {
+    font-size: 12px !important;
+}
 
 }
 .right_contain {

src/xt_pages/workforce/components/setup_template_dialog.vue

@@ -72,9 +72,9 @@ export default {
       },
       visible: false,
       week_time:"",
+      week_time_two:"",
       form: {
         mode: 0,
-        week_time:"",
       }
     }
   },
@@ -107,11 +107,8 @@ export default {
     },
 
     changeWeek(val) {
-      this.form.week_time = this.getYearWeek(val) -1
-
-
-
-
+      // this.week_time = this.getYearWeek(val) -1
+      this.template_mode.original_week =  this.getYearWeek(val) -1
     },
     _close: function (done) {
       this.clear()
@@ -121,8 +118,7 @@ export default {
 
     },
     show() {
-      this.clear()
-      this.form.week_time = this.template_mode.origin_mode
+      this.week_time =""
       this.visible = true
     },
     hide() {
@@ -130,8 +126,7 @@ export default {
       this.visible = false
     },
     saveAction: function () {
-      console.log(this.form.week_time)
-      if(this.form.mode > 0 && this.form.week_time.length == 0){
+      if(this.form.mode > 0 && this.week_time.length == 0){
         this.$message.error("请选择模版自动生成起始周")
         return
       }
@@ -168,12 +163,10 @@ export default {
       }
     },
     submit: function () {
-      setTemplateMode(this.form.mode,this.form.week_time).then(rs => {
+      setTemplateMode(this.form.mode,this.template_mode.original_week).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           this.template_mode.mode = this.form.mode
-          this.template_mode.original_week = this.form.week_time
-
           this.hide()
           this.$emit('chenge_mode', this.form.mode)
         } else {

src/xt_pages/workforce/components/tableData.vue

@@ -878,12 +878,12 @@ export default {
     },
     weekTime: function() {
       // 
-      // if(this.weekTime != 'historyWeek'){
+      if(this.weekTime != 'historyWeek'){
         console.log('12343455',this.weekTime);
         var theType = this.weekType(this.weekTime);
         this.theType = theType
         this.getSchedules();
-      // }
+      }
       
     },
     scheduleZoneRow: function() {
@@ -992,10 +992,11 @@ export default {
           if (response.data.state == 0) {
             return false
           }
+          console.log("触发232332323232",response.data.data)
           var partitions = response.data.data.partitions
           console.log("partitions",partitions)
           this.theWeek.thisWeek = response.data.data.theWeek
-
+          // this.theWeek.historyWeek=this.theWeek.thisWeek - 2
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
           this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
@@ -2967,9 +2968,9 @@ export default {
     weekType(weekTime) {
       var theType = 2;
       switch (weekTime) {
-        case "historyWeek":
-          theType = 0;
-          break;
+        // case "historyWeek":
+        //   theType = 0;
+        //   break;
         case "lastWeek":
           theType = 1;
           break;
@@ -3345,9 +3346,11 @@ textarea{
 .schedule-table-row td:hover {
   background: rgb(88, 162, 236) !important;
 }
-
+.el-table {
+    font-size: 12px !important;
+}
 .schedule-table-row td .cell {
-  font-size: 12px;
+  font-size: 10px;
   white-space:normal  !important;
   // normal
 }

src/xt_pages/workforce/components/template_schedule_dialog.vue

@@ -0,0 +1,138 @@
+<template>
+  <el-dialog
+    width="40%"
+    :visible.sync="visible"
+    :before-close="_close"
+  >
+    <el-form :model="form" label-width="80px" :rules="rules">
+            <el-form-item label="患者" required prop="patient_id">
+              <el-select
+                v-model="form.patient_id"
+                placeholder="选择患者"
+                filterable
+                clearable
+              >
+                <el-option
+                  v-for="item in patients"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.name"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+      <el-form-item label="透析模式" required prop="treat_mode">
+        <el-select
+          v-model="form.treat_mode"
+          placeholder="选择透析模式"
+          clearable
+        >
+          <el-option
+            v-for="mode in treatment_modes"
+            :key="mode.id"
+            :value="mode.id"
+            :label="mode.name"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取消</el-button>
+      <el-button type="primary" @click="saveAction">保 存</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "TemplateScheduleDialog",
+  data() {
+    return {
+      patients:[],
+      visible: false,
+      form: {
+        patient_id: "",
+        treat_mode: "",
+        weekday: 1,
+        time_type: 1,
+        device_number_id: 0
+      },
+      treatment_modes: {},
+      rules: {
+        patient_id: [{ required: true, message: "请选择患者" }],
+        treat_mode: [{ required: true, message: "请选择透析模式" }]
+      }
+    };
+  },
+
+  created() {
+    this.treatment_modes = this.$store.getters.treatment_mode;
+  },
+  methods: {
+    _close: function(done) {
+      this.clear();
+      done();
+    },
+    clear: function() {
+      this.form.patient_id = "";
+      this.form.treat_mode = "";
+      this.form.weekday = 1;
+      this.form.time_type = 1;
+      this.form.device_number_id = 0;
+    },
+    show(weekday, time_type, device_number_id,patients) {
+      this.clear();
+      this.patients = patients
+      console.log(this.patients)
+      this.form.weekday = weekday;
+      this.form.time_type = time_type;
+      this.form.device_number_id = device_number_id;
+      this.visible = true;
+    },
+    showWith(patient_id, treat_mode, weekday, time_type, device_number_id,patients) {
+      this.clear();
+      this.patients = patients
+      console.log(this.patients)
+      this.form.patient_id = patient_id;
+      this.form.treat_mode = treat_mode;
+      this.form.weekday = weekday;
+      this.form.time_type = time_type;
+      this.form.device_number_id = device_number_id;
+      this.visible = true;
+    },
+    hide() {
+      this.clear();
+      this.visible = false;
+    },
+    saveAction: function() {
+      if (this.form.patient_id <= 0) {
+        this.$message.error("请选择患者", 1500);
+        return;
+      }
+      if (this.form.treat_mode <= 0) {
+        this.$message.error("请选择透析模式", 1500);
+        return;
+      }
+      this.$emit(
+        "did_selected",
+        this.form.patient_id,
+        this.form.treat_mode,
+        this.form.weekday,
+        this.form.time_type,
+        this.form.device_number_id
+      );
+    },
+    cancelScheduleAction: function() {
+      this.$emit(
+        "did_cancel",
+        this.form.weekday,
+        this.form.time_type,
+        this.form.device_number_id
+      );
+    }
+  }
+};
+</script>
+
+<style scoped></style>

src/xt_pages/workforce/components/template_table.vue

@@ -972,6 +972,15 @@
       @did_selected="will_add_schedule_action_three"
       @did_cancel="cancel_schedule_action"
     ></schedule-selector-dialog>
+
+    <template-schedule-dialog
+      ref="selector_dialog_two"
+      :patients="patients"
+      @did_selected="will_add_schedule_action_four"
+      @did_cancel="cancel_schedule_action"
+    >
+    </template-schedule-dialog>
+
     <!-- 智能排班 -->
     <div class="dialog-wrapper">
       <el-dialog
@@ -1210,6 +1219,7 @@ import {
 import TemplateTableItem from "./template_table_item";
 import ScheduleSelectorDialog from "./template_schedule_selector_dialog";
 import { PostSearchSmartSchTemplatePatient } from "../../../api/schedule_template/sch_template";
+import TemplateScheduleDialog from './template_schedule_dialog'
 
 const weekOptions = [
   {
@@ -1253,6 +1263,7 @@ var rowspanNoControl = -1;
 export default {
   name: "TemplateTable",
   components: {
+    TemplateScheduleDialog,
     TemplateTableItem,
     ScheduleSelectorDialog,
   },
@@ -1795,7 +1806,7 @@ export default {
 
           if (info.pid > 0 || info.treat_mode_id > 0 ) {
             if (this.cur_drag_obj == 2){
-             
+
               if(info.pid != this.cur_drag_info.patient_id){
                 console.log('1234132412',info.pid,this.cur_drag_info.patient_id);
                 this.tipDialogVisible = true
@@ -2639,7 +2650,7 @@ export default {
         this.cur_drag_info.id = 0;
 
       }
-        
+
         console.log('this.cur_drag_info的数据',this.cur_drag_info);
       },
     allowDrop(e) {
@@ -2760,7 +2771,7 @@ export default {
       }
       return "";
     },
-    
+
     makeDeviceNumbers: function (device_numbers) {
       this.all_zones = [];
       this.devices = [];
@@ -2998,26 +3009,19 @@ export default {
             this.cur_info.patient_name = row[column.property].name
             this.cur_info.mode_name = row[column.property].treat_mode
             console.log('this.patient_id_hover的数据',this.patient_id_hover);
-      }
-
-      // 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;
+      }else{
+        var item = row[column.property]
+        var weekday_timetype = column.property.split('_')
+        var weekday = weekday_timetype[0]
+        var time_type = weekday_timetype[1]
+        var device_number_id = row.id
+        if (item.pid == 0) {
+          this.$refs.selector_dialog_two.show(weekday, time_type, device_number_id,this.patients)
+        } else {
+          this.$refs.selector_dialog_two.showWith(item.pid, item.treat_mode_id, weekday, time_type, device_number_id,this.patients)
+        }
 
-      //   }
+      }
     },
     // 双击
     itemdblclick (row, column, cell, event){
@@ -3127,6 +3131,88 @@ export default {
       }
 
       this.$message.error("设备不存在");
+    },  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]
+        if (p.id == patient_id) {
+          patient = p
+          break
+        }
+      }
+      if (patient == null) {
+        this.$message.error('患者不存在')
+        return
+      }
+
+      for (let index = 0; index < this.opera_device_numbers.length; index++) {
+        const device_number = this.opera_device_numbers[index]
+        console.log(device_number)
+        for (let t_y = 1; t_y <= 3; t_y++) {
+          if (t_y == time_type && device_number_id == device_number.id) {
+            continue
+          }
+          if (device_number[weekday + '_' + t_y].pid == patient_id) {
+            this.$message.error('同位患者一天内不可有两次排班')
+            return
+          }
+        }
+      }
+
+      for (let index = 0; index < this.opera_device_numbers.length; index++) {
+        const device_number = this.opera_device_numbers[index]
+        if (device_number.id == device_number_id) {
+          var isDiseaseSame = false
+          var havePatientDisease = patient.contagions.length > 0
+          if (patient.contagions.length > 0 || device_number.zone.type != 1) {
+            if (device_number.zone.type != 1) {
+              for (let c_i = 0; c_i < patient.contagions.length; c_i++) {
+                const contagion = patient.contagions[c_i]
+                if (contagion.disease_id == device_number.zone.type) {
+                  isDiseaseSame = true
+                }
+              }
+            }
+          } else {
+            isDiseaseSame = true
+          }
+          if (isDiseaseSame == false) {
+            // 此患者没有传染病，与此透析机不匹配，确定在此排班吗?
+            // 此患者有传染病，与此透析机不匹配，确定在此排班吗?
+            var msg = havePatientDisease ? '此患者有传染病，与此透析机不匹配，确定在此排班吗?' : '此患者没有传染病，与此透析机不匹配，确定在此排班吗?'
+            this.$confirm(msg, '提示', { confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning' })
+              .then(() => {
+                // this.add_scheduleTwo(patient, device_number, treat_mode, weekday, time_type)
+
+                this.will_add_schedule_action(
+                  patient.id,
+                  treat_mode,
+                  weekday,
+                  time_type,
+                  device_number.id,
+                  0
+                );
+                this.saveActionTwo();
+              })
+          } else {
+            // this.add_scheduleTwo(patient, device_number, treat_mode, weekday, time_type)
+            this.will_add_schedule_action(
+              patient.id,
+              treat_mode,
+              weekday,
+              time_type,
+              device_number.id,
+              0
+            );
+            this.saveActionTwo();
+          }
+          // this.saveActionTwo()
+          this.$refs.selector_dialog_two.hide()
+          return
+        }
+      }
+
+      this.$message.error('设备不存在')
     },
     will_add_schedule_action_three: function (
       patient_id,

src/xt_pages/workforce/template.vue

@@ -118,29 +118,36 @@
 <!--          <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" :label=" first_template.week?'一周模版'+ first_template.week+'周':'一周模版'">
+        <el-tab-pane name="first" :disabled="template_mode.mode == 0" >
 <!--          <span slot="label">-->
 <!--          </span>-->
+          <span slot="label"> {{first_template.week?'一周模版'+ 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 == 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="  second_template.week?'二周模版' + second_template.week+'周':'二周模版'" 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?'二周模版' + 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>
         </el-tab-pane>
 
 
 
         <el-tab-pane :label="  third_template.week? '三周模版' + third_template.week+'周':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
-<!--          <span slot="label">三周模版{{ third_template.week?third_template.week+'周':" "}}-->
-<!--             <span v-if="schedule.execute_times%2==0">(下一周)</span>-->
-<!--             <span v-if="schedule.execute_times%2!=0">(本周)</span>-->
-<!--                  <span v-if="schedule.execute_times%4==0">(本周)</span>-->
-<!--             <span v-if="schedule.execute_times%4==1">(下一周)</span>-->
-<!--            <span v-if="schedule.execute_times%4==2">(下二周)</span>-->
-<!--             <span v-if="schedule.execute_times%4==3">(下三周)</span>-->
-<!--           </span>-->
+
 <!--          <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>