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

src/router/modules/dialysis.js

@@ -189,7 +189,19 @@ export default {
         import("@/xt_pages/dialysis/batch_print/batch_print_order_twelve"),
       hidden: true,
       is_menu: false,
-      name: "dialysis_batch_nine",
+      name: "dialysis_batch_twelve",
+      meta: {
+        title: "批量打印",
+        noCache: true
+      }
+    },
+    {
+      path: "/dialysis/print/batch/thirteen",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_thirteen"),
+      hidden: true,
+      is_menu: false,
+      name: "dialysis_batch_thirteen",
       meta: {
         title: "批量打印",
         noCache: true

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -140,6 +140,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 13">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -643,6 +653,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/nine" });
       } else if (this.template_id == 12) {
         this.$router.push({ path: "/dialysis/print/batch/twelve" });
+      } else if (this.template_id == 13) {
+        this.$router.push({ path: "/dialysis/print/batch/thirteen" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/user/inspection.vue

@@ -671,7 +671,6 @@ export default {
             var inspections = response.data.data.inspections;
             this.total = response.data.data.total;
             this.itemDate = response.data.data.date.split(" ")[0];
-            console.log("1111"+this.itemDate)
             this.inspections = response.data.data.inspections;
             if (inspections == null) {
               this.inspections = [];
@@ -680,28 +679,52 @@ export default {
             var inspectionsMap = {};
             this.inspectionsMap = {};
             for (var index in inspections) {
+              console.log(inspections[index])
               inspectionsMap[inspections[index].item_id] = inspections[index];
+
               this.inspectionsMap[inspections[index].item_id] =
                 inspections[index];
             }
             var items = this.project.inspection_reference;
+
+            console.log(items)
+            console.log(inspectionsMap)
+
+
+
             for (var index in items) {
+
               if (
                 items[index].id in inspectionsMap ||
                 items[index].item_id in inspectionsMap
               ) {
+
+
                 var item = {};
                 for (var key in items[index]) {
                   item[key] = items[index][key];
                 }
+                console.log(item.item_id);
+
                 if (item.item_id > 0) {
+                  console.log(item)
+                  console.log(items[index].item_id)
+                  console.log(inspectionsMap)
+
+                  console.log(inspectionsMap[parseInt(items[index].item_id)].inspect_value)
+
                   item.value =
                     inspectionsMap[items[index].item_id].inspect_value;
+
+
                 } else {
+
                   item.value = inspectionsMap[items[index].id].inspect_value;
                 }
+
                 item.value_direction = "";
                 if (item.range_type == 1) {
+
                   var value = parseFloat(item.value);
                   var range_min = parseFloat(item.range_min);
                   var range_max = parseFloat(item.range_max);
@@ -712,9 +735,12 @@ export default {
                   }
                 }
                 this.items.push(item);
+
               }
+
             }
-            console.log(this.items);
+
+
           }
         })
         .catch(v => {});

src/xt_pages/workforce/appointment.vue

@@ -210,6 +210,8 @@
 
       },
       getWeekPanels() {
+        // this.scheduleZoneRow = []
+        // this.scheduleZone = []
         getWeekPanels(1).then(response => {
           if (response.data.state == 0) {
             return false