列表转化日期BUG__快捷建单根据检验方式来

pages/receiptpage/receiptpage.vue

@@ -310,10 +310,10 @@
             0
           );
           const month = (nDate.getMonth() + 1).toString().padStart(2, 0);
-          const day = nDate.getDay().toString().padStart(2, 0);
+          const date = nDate.getDate().toString().padStart(2, 0);
           const hour = nDate.getHours().toString().padStart(2, 0);
           const minute = nDate.getMinutes().toString().padStart(2, 0);
-          return `${month}-${day} ${hour}:${minute}`;
+          return `${month}-${date} ${hour}:${minute}`;
         } else {
           return "-";
         }

pages/shortcutbuildOrders/shortcutbuildOrders.vue

@@ -16,14 +16,18 @@
         <view class="page_item_cont">
           <view class="page_item_cont_T">
             <view class="page_item_cont_title">
-              <view> <view class="starting">起</view> 起点科室 </view>
+              <view>
+                <view class="starting">起</view> 起点科室
+              </view>
               <view class="text_big">{{ msg.startDeptShow }}</view>
             </view>
           </view>
           <view class="line"></view>
           <view class="page_item_cont_B">
             <view class="page_item_cont_title">
-              <view> <view class="End">终</view> 终点科室 </view>
+              <view>
+                <view class="End">终</view> 终点科室
+              </view>
               <view class="text_big">
                 <view v-for="(item, i) in targetDeptShow" :key="i">{{
                   item
@@ -44,279 +48,261 @@
   </view>
 </template>
 <script>
-import { get, post, SM, webHandle } from "../../http/http.js";
-export default {
-  data() {
-    return {
-      msg: {}, //页面展示信息
-      targetDeptShow: [], //目标科室
-    };
-  },
-  methods: {
-    // 新建工单并签到
-    createOrder() {
-      get(`/workerOrder/createQuickOrder/${this.msg.id}`, {}).then((res) => {
-        if (res.status == 200) {
-          uni.navigateTo({
-            url: "../receiptpage/receiptpage",
-          });
-        } else {
-          uni.showToast({
-            icon: "none",
-            title: "请求失败！",
-          });
-        }
-      });
+  import {
+    get,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        msg: {}, //页面展示信息
+        targetDeptShow: [], //目标科室
+      };
+    },
+    methods: {
+      // 新建工单并签到
+      createOrder() {
+        get(`/workerOrder/createQuickOrder/${this.msg.id}`, {}).then((res) => {
+          console.log(res)
+          if (res.status == 200) {
+            if (res.type === 'plan-spe-ddd-2') {
+              //需要扫描标本
+              uni.navigateTo({
+                url: `../../pages/scanning_code/scanning_code?type=${res.associationTypeName}&type1=${res.type}&id=${res.id}&deptCode=${res.deptCode}&dept=${res.deptName}&accountObj=undefined`,
+              });
+            } else {
+              uni.navigateTo({
+                url: "../receiptpage/receiptpage",
+              });
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+      },
     },
-  },
-  onLoad(options) {
-    console.log(options, "快捷建单");
-    this.msg = JSON.parse(options.infoDATA);
-    this.targetDeptShow = this.msg.targetDeptShow.split(",");
-    // #ifdef APP-PLUS
-    webHandle("no", "app");
-    // #endif
-    // #ifdef H5
-    webHandle("no", "wx");
-    // #endif
-  },
-};
+    onLoad(options) {
+      console.log(options, "快捷建单");
+      this.msg = JSON.parse(options.infoDATA);
+      this.targetDeptShow = this.msg.targetDeptShow.split(",");
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
 </script>
 <style lang="less">
-.Receipt_infopage {
-  .title {
-    font-size: 48rpx;
-    margin-top: 24rpx;
-    margin-bottom: 24rpx;
-    text-align: center;
-  }
+  .Receipt_infopage {
+    .title {
+      font-size: 48rpx;
+      margin-top: 24rpx;
+      margin-bottom: 24rpx;
+      text-align: center;
+    }
 
-  .page_item_wrap {
-    width: 100%;
-    height: auto;
-    box-sizing: border-box;
-    position: absolute;
-
-    .page_item {
-      margin-top: 16rpx;
-      margin-bottom: 124rpx;
-      background: #fff;
-      border-radius: 8rpx;
-      margin: 0 20rpx;
-      border: 2rpx solid #e5e9ed;
-      position: relative;
-      overflow: hidden;
-      padding: 0 16rpx;
-
-      .L {
-        width: 40rpx;
-        height: 40rpx;
-        border-radius: 50%;
-        background: #f9fafb;
-        position: absolute;
-        left: -20rpx;
-        top: 68rpx;
-        border: 2rpx solid #e5e9ed;
-      }
+    .page_item_wrap {
+      width: 100%;
+      height: auto;
+      box-sizing: border-box;
+      position: absolute;
 
-      .R {
-        width: 40rpx;
-        height: 40rpx;
-        border-radius: 50%;
-        background: #f9fafb;
-        position: absolute;
-        float: right;
-        right: -20rpx;
-        top: 68rpx;
+      .page_item {
+        margin-top: 16rpx;
+        margin-bottom: 124rpx;
+        background: #fff;
+        border-radius: 8rpx;
+        margin: 0 20rpx;
         border: 2rpx solid #e5e9ed;
-      }
-
-      .starting {
-        width: 50rpx;
-        height: 50rpx;
-        color: #fff;
-        background: #49b856;
-        display: inline-block;
-        border-radius: 50%;
-        text-align: center;
-        line-height: 46rpx;
-        font-size: 32rpx;
-        margin-right: 6rpx;
-      }
+        position: relative;
+        overflow: hidden;
+        padding: 0 16rpx;
 
-      .End {
-        width: 50rpx;
-        height: 50rpx;
-        color: #fff;
-        background: #39b199;
-        display: inline-block;
-        border-radius: 50%;
-        text-align: center;
-        line-height: 46rpx;
-        font-size: 32rpx;
-        margin-right: 6rpx;
-      }
+        .L {
+          width: 40rpx;
+          height: 40rpx;
+          border-radius: 50%;
+          background: #f9fafb;
+          position: absolute;
+          left: -20rpx;
+          top: 68rpx;
+          border: 2rpx solid #e5e9ed;
+        }
 
-      .page_item_top {
-        height: 88rpx;
-        border-bottom: 2rpx dashed #e5e9ed;
-        padding: 0 16rpx;
+        .R {
+          width: 40rpx;
+          height: 40rpx;
+          border-radius: 50%;
+          background: #f9fafb;
+          position: absolute;
+          float: right;
+          right: -20rpx;
+          top: 68rpx;
+          border: 2rpx solid #e5e9ed;
+        }
 
-        .page_item_top-inner {
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          height: 100%;
+        .starting {
+          width: 50rpx;
+          height: 50rpx;
+          color: #fff;
+          background: #49b856;
+          display: inline-block;
+          border-radius: 50%;
+          text-align: center;
+          line-height: 46rpx;
+          font-size: 32rpx;
+          margin-right: 6rpx;
+        }
 
-          .page_item_top_L {
-            .emergencys {
-              background: #ff3b53 !important;
-              width: 124rpx !important;
-            }
+        .End {
+          width: 50rpx;
+          height: 50rpx;
+          color: #fff;
+          background: #39b199;
+          display: inline-block;
+          border-radius: 50%;
+          text-align: center;
+          line-height: 46rpx;
+          font-size: 32rpx;
+          margin-right: 6rpx;
+        }
 
-            .emergency {
-              background: #ff3b53 !important;
-            }
+        .page_item_top {
+          height: 88rpx;
+          border-bottom: 2rpx dashed #e5e9ed;
+          padding: 0 16rpx;
 
-            .emergency1 {
-              background: #49b856 !important;
-            }
+          .page_item_top-inner {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            height: 100%;
 
-            .page_item_cont_start {
-              text-align: center;
-              height: 44rpx;
-              width: 104rpx;
-              line-height: 44rpx;
-              border-radius: 8rpx;
-              background: #49b856;
-              color: #fff;
-              display: inline-block;
+            .page_item_top_L {
+              .emergencys {
+                background: #ff3b53 !important;
+                width: 124rpx !important;
+              }
+
+              .emergency {
+                background: #ff3b53 !important;
+              }
+
+              .emergency1 {
+                background: #49b856 !important;
+              }
+
+              .page_item_cont_start {
+                text-align: center;
+                height: 44rpx;
+                width: 104rpx;
+                line-height: 44rpx;
+                border-radius: 8rpx;
+                background: #49b856;
+                color: #fff;
+                display: inline-block;
+              }
+
+              .L_time {
+                color: #6cc076;
+                font-size: 32rpx;
+              }
+
+              .L_text {
+                font-size: 32rpx;
+                font-weight: 700;
+              }
             }
 
-            .L_time {
-              color: #6cc076;
+            .page_item_top_R {
               font-size: 32rpx;
-            }
 
-            .L_text {
-              font-size: 32rpx;
-              font-weight: 700;
+              .L_iocn {
+                color: rgb(7, 134, 60);
+                font-size: 36rpx;
+                font-weight: 700;
+              }
             }
           }
+        }
 
-          .page_item_top_R {
+        .page_item_cont {
+          min-height: 180rpx;
+          // max-height: 424rpx;
+          padding: 0 16rpx;
+          text-align: left;
+          position: relative;
+
+          .text_big {
             font-size: 32rpx;
+            font-weight: 700;
+            margin-top: 10rpx;
 
-            .L_iocn {
-              color: rgb(7, 134, 60);
-              font-size: 36rpx;
+            p {
               font-weight: 700;
+              line-height: 1.5;
             }
           }
-        }
-      }
-
-      .page_item_cont {
-        min-height: 180rpx;
-        // max-height: 424rpx;
-        padding: 0 16rpx;
-        text-align: left;
-        position: relative;
 
-        .text_big {
-          font-size: 32rpx;
-          font-weight: 700;
-          margin-top: 10rpx;
-
-          p {
-            font-weight: 700;
-            line-height: 1.5;
+          .line {
+            height: 20rpx;
+            width: 2rpx;
+            border-left: 2rpx solid #e5e9ed;
+            position: absolute;
+            top: 82rpx;
+            left: 40rpx;
           }
-        }
-
-        .line {
-          height: 20rpx;
-          width: 2rpx;
-          border-left: 2rpx solid #e5e9ed;
-          position: absolute;
-          top: 82rpx;
-          left: 40rpx;
-        }
-
-        .lines {
-          height: 40%;
-          width: 2rpx;
-          border-left: 2rpx solid #e5e9ed;
-          position: absolute;
-          top: 23%;
-          left: 36rpx;
-        }
 
-        .page_item_cont_T {
-          padding-top: 28rpx;
-          font-size: 28rpx;
-
-          .page_item_cont_title {
-            height: 100%;
-            font-size: 32rpx;
-            display: flex;
-            justify-content: space-between;
+          .lines {
+            height: 40%;
+            width: 2rpx;
+            border-left: 2rpx solid #e5e9ed;
+            position: absolute;
+            top: 23%;
+            left: 36rpx;
           }
-        }
 
-        .page_item_cont_B {
-          padding-top: 28rpx;
-          margin-bottom: 28rpx;
+          .page_item_cont_T {
+            padding-top: 28rpx;
+            font-size: 28rpx;
 
-          .page_item_cont_title {
-            font-size: 32rpx;
-            display: flex;
-            justify-content: space-between;
-          }
-
-          .page_item_cont_title1 {
-            height: 60rpx;
-            line-height: 60rpx;
-            font-size: 32rpx;
-            padding-left: 64rpx;
+            .page_item_cont_title {
+              height: 100%;
+              font-size: 32rpx;
+              display: flex;
+              justify-content: space-between;
+            }
           }
-        }
-      }
-
-      .page_item_foot {
-        border-top: 2rpx dashed #e5e9ed;
-        border-bottom: 2rpx dashed #e5e9ed;
-        padding: 28rpx 16rpx;
-        text-align: left;
 
-        .page_item_foot_text {
-          font-size: 32rpx;
-          margin-bottom: 20rpx;
+          .page_item_cont_B {
+            padding-top: 28rpx;
+            margin-bottom: 28rpx;
 
-          .text1 {
-            color: rgb(102, 102, 102);
-          }
+            .page_item_cont_title {
+              font-size: 32rpx;
+              display: flex;
+              justify-content: space-between;
+            }
 
-          .text2 {
-            float: right;
-            font-weight: 700;
+            .page_item_cont_title1 {
+              height: 60rpx;
+              line-height: 60rpx;
+              font-size: 32rpx;
+              padding-left: 64rpx;
+            }
           }
         }
-      }
 
-      #infos {
-        display: none;
-      }
-
-      .page_item_infos {
-        padding-bottom: 20rpx;
-        border-bottom: 2rpx dashed #e5e9ed;
-
-        .page_item_info2 {
+        .page_item_foot {
+          border-top: 2rpx dashed #e5e9ed;
+          border-bottom: 2rpx dashed #e5e9ed;
+          padding: 28rpx 16rpx;
           text-align: left;
-          line-height: 60rpx;
-          font-size: 32rpx;
-          padding-left: 16rpx;
 
           .page_item_foot_text {
             font-size: 32rpx;
@@ -332,49 +318,78 @@ export default {
             }
           }
         }
+
+        #infos {
+          display: none;
+        }
+
+        .page_item_infos {
+          padding-bottom: 20rpx;
+          border-bottom: 2rpx dashed #e5e9ed;
+
+          .page_item_info2 {
+            text-align: left;
+            line-height: 60rpx;
+            font-size: 32rpx;
+            padding-left: 16rpx;
+
+            .page_item_foot_text {
+              font-size: 32rpx;
+              margin-bottom: 20rpx;
+
+              .text1 {
+                color: rgb(102, 102, 102);
+              }
+
+              .text2 {
+                float: right;
+                font-weight: 700;
+              }
+            }
+          }
+        }
       }
-    }
 
-    .L-l {
-      width: 2rpx;
-      height: 40rpx;
-      background: #f9fafb;
-      position: absolute;
-      left: 20rpx;
-      top: 72rpx;
+      .L-l {
+        width: 2rpx;
+        height: 40rpx;
+        background: #f9fafb;
+        position: absolute;
+        left: 20rpx;
+        top: 72rpx;
+      }
+
+      .R-l {
+        width: 2rpx;
+        height: 40rpx;
+        background: #f9fafb;
+        position: absolute;
+        right: 20rpx;
+        top: 72rpx;
+      }
     }
 
-    .R-l {
-      width: 2rpx;
-      height: 40rpx;
+    .foot_btn2 {
+      position: fixed;
+      bottom: 0;
+      width: 100vw;
+      padding: 0 20rpx;
+      box-sizing: border-box;
+      line-height: 66rpx;
+      height: 100rpx;
+      border-top: 2rpx solid #e5e9ed;
       background: #f9fafb;
-      position: absolute;
-      right: 20rpx;
-      top: 72rpx;
-    }
-  }
+      text-align: center;
 
-  .foot_btn2 {
-    position: fixed;
-    bottom: 0;
-    width: 100vw;
-    padding: 0 20rpx;
-    box-sizing: border-box;
-    line-height: 66rpx;
-    height: 100rpx;
-    border-top: 2rpx solid #e5e9ed;
-    background: #f9fafb;
-    text-align: center;
-
-    .btn2 {
-      height: 66rpx;
-      width: 100%;
-      background-image: linear-gradient(to right, #72c172, #3bb197);
-      color: #fff;
-      border-radius: 8rpx;
-      font-size: 32rpx;
-      margin-top: 16rpx;
+      .btn2 {
+        height: 66rpx;
+        width: 100%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+      }
     }
   }
-}
 </style>