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

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue

@@ -876,10 +876,10 @@
                             >iu</span
                           >
                           <span v-if="record.prescription.anticoagulant == 2"
-                            >iu</span
+                            >mg</span
                           >
                           <span v-if="record.prescription.anticoagulant == 1"
-                            >mg</span
+                            ></span
                           >
                         </div>
                         <div class="inline_block" style="margin-left: 20px">
@@ -920,14 +920,14 @@
                           <span v-if="record.prescription.anticoagulant == 4"
                             >mg/h</span
                           >
-                          <span v-if="record.prescription.anticoagulant == 3"
+                          <span v-if="record.prescription.anticoagulant == 3 || record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7"
                             >iu/h</span
                           >
                           <span v-if="record.prescription.anticoagulant == 2"
-                            >iu/h</span
+                            >mg/h</span
                           >
                           <span v-if="record.prescription.anticoagulant == 1"
-                            >mg/h</span
+                            ></span
                           >
                         </div>
                         <div class="inline_block" style="margin-left: 20px">
@@ -946,14 +946,14 @@
                           <span v-if="record.prescription.anticoagulant == 4"
                             >mg</span
                           >
-                          <span v-if="record.prescription.anticoagulant == 3"
+                          <span v-if="record.prescription.anticoagulant == 3 || record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7"
                             >iu</span
                           >
                           <span v-if="record.prescription.anticoagulant == 2"
-                            >iu</span
+                            >mg</span
                           >
                           <span v-if="record.prescription.anticoagulant == 1"
-                            >mg</span
+                            ></span
                           >
                         </div>
                         <div class="inline_block" style="margin-left: 20px">

src/xt_pages/workforce/components/tableData.vue

@@ -502,10 +502,10 @@
                 @change="changePartition"
             >
               <el-option
-                  v-for="item in zones"
-                  :key="item"
-                  :label="item"
-                  :value="item"
+                v-for="(item, index) in zones"
+                :key="index"
+                :label="item.name"
+                :value="item.id"
               >
               </el-option>
             </el-select>
@@ -2337,63 +2337,62 @@ export default {
               type: "success",
               message: "修改成功!"
             });
-            this.getSchedules()
-            // var that = this;
-            // var schedule = response.data.data.schedule;
-            // this.scheduleZone.forEach(function(zone, index) {
-            //   if (
-            //     zone.zone_id == schedule.partition_id &&
-            //     zone.jihao_id == schedule.bed_id
-            //   ) {
-            //     var weekPath = that.weekPath(
-            //       schedule.schedule_week,
-            //       schedule.schedule_type
-            //     );
-            //     if (weekPath.length == 2) {
-            //       var weekPathKey = weekPath[0] + "_" + weekPath[1];
-            //       that.scheduleZone[index][weekPathKey] = {
-            //         schedule_id: schedule.id,
-            //         mode_id: schedule.mode_id,
-            //         patient_id: schedule.patient_id,
-            //         patient: that.currentData.patient,
-            //
-            //
-            //         dialysis_machine_name:schedule.dialysis_machine_name,
-            //
-            //         patient_contagions: that.currentData.contagions,
-            //         mode_name:
-            //           typeof that.modeOptions[schedule.mode_id] === "undefined"
-            //             ? ""
-            //             : that.modeOptions[schedule.mode_id].name
-            //       };
-            //
-            //       that.scheduleZone[index].total += 1;
-            //     }
-            //   }
-            //   if (
-            //     zone.zone_id == that.currentData.partition_id &&
-            //     zone.jihao_id == that.currentData.bed_id
-            //   ) {
-            //     var weekPath = that.weekPath(
-            //       that.currentData.schedule_week,
-            //       that.currentData.schedule_type
-            //     );
-            //     if (weekPath.length == 2) {
-            //       var weekPathKey = weekPath[0] + "_" + weekPath[1];
-            //       that.scheduleZone[index][weekPathKey] = {
-            //         schedule_id: 0,
-            //         mode_id: 0,
-            //         patient_id: 0,
-            //         patient: "",
-            //         mode_name: "",
-            //         dialysis_machine_name:"",
-            //         patient_contagions: []
-            //       };
-            //
-            //       that.scheduleZone[index].total -= 1;
-            //     }
-            //   }
-            // });
+            var that = this;
+            var schedule = response.data.data.schedule;
+            this.scheduleZone.forEach(function(zone, index) {
+              if (
+                zone.zone_id == schedule.partition_id &&
+                zone.jihao_id == schedule.bed_id
+              ) {
+                var weekPath = that.weekPath(
+                  schedule.schedule_week,
+                  schedule.schedule_type
+                );
+                if (weekPath.length == 2) {
+                  var weekPathKey = weekPath[0] + "_" + weekPath[1];
+                  that.scheduleZone[index][weekPathKey] = {
+                    schedule_id: schedule.id,
+                    mode_id: schedule.mode_id,
+                    patient_id: schedule.patient_id,
+                    patient: that.currentData.patient,
+
+
+                    dialysis_machine_name:schedule.dialysis_machine_name,
+
+                    patient_contagions: that.currentData.contagions,
+                    mode_name:
+                      typeof that.modeOptions[schedule.mode_id] === "undefined"
+                        ? ""
+                        : that.modeOptions[schedule.mode_id].name
+                  };
+
+                  that.scheduleZone[index].total += 1;
+                }
+              }
+              if (
+                zone.zone_id == that.currentData.partition_id &&
+                zone.jihao_id == that.currentData.bed_id
+              ) {
+                var weekPath = that.weekPath(
+                  that.currentData.schedule_week,
+                  that.currentData.schedule_type
+                );
+                if (weekPath.length == 2) {
+                  var weekPathKey = weekPath[0] + "_" + weekPath[1];
+                  that.scheduleZone[index][weekPathKey] = {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    patient_id: 0,
+                    patient: "",
+                    mode_name: "",
+                    dialysis_machine_name:"",
+                    patient_contagions: []
+                  };
+
+                  that.scheduleZone[index].total -= 1;
+                }
+              }
+            });
             this.$refs[formName].resetFields();
             this.jhDialogVisible = false;
           }
@@ -2517,7 +2516,7 @@ export default {
             this.changeSchedule.schedule_type
           );
           if (weekPath.length != 2) {
-            this.$message.error('数据异常');
+            this.$message.error("数据异常");
             return false;
           }
 
@@ -3168,6 +3167,7 @@ export default {
         schedule_date:  this.currentData.schedule_date,
         patient_id: this.currentData.patient_id,
       };
+
       //进行网络请求，获取空排班机位
       getSmartDevices(params).then((response) => {
         if (response.data.state == 0) {
@@ -3186,9 +3186,7 @@ export default {
           // }
           // this.zone_names=devices[0];
           this.zone_name = (devices[0].zone_name)
-          console.log("hhahhahah",this.zone_name)
           this.device_id = devices[0].id
-          console.log('zone_namess的数据',this.zone_names);
         }
       });
 

src/xt_pages/workforce/components/template_table.vue

@@ -3800,7 +3800,7 @@ export default {
     position: absolute;
     right: 0px;
     top: -3px;
-    // visibility: hidden;
+    visibility: hidden;
     .el-button {
       width: 15px;
       height: 15px;