BUG修复边框样式整理

components/seiminFooterBtn/seiminFooterBtn.vue

@@ -29,8 +29,8 @@
     height: 100rpx;
     z-index: 9;
     background-color: #fff;
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
     padding: 0 25rpx;
+    @include border(top);
     @include flex(space-between, center);
 
     uni-button {
@@ -51,7 +51,7 @@
 
     .default {
       background-color: #fff;
-      border: 1px solid $defaultColor;
+      @include border($color:$defaultColor);
       color: $defaultColor;
     }
 

components/seiminFooterNav/seiminFooterNav.vue

@@ -110,8 +110,8 @@
     height: 100rpx;
     z-index: 9;
     background-color: #fff;
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
     padding: 0 60rpx;
+    @include border(top,rgba(0, 0, 0, 0.1));
     @include flex(space-between, center);
 
     .seiminFooterNav_item {

components/seiminModel/seiminModel.vue

@@ -105,6 +105,16 @@
         evaluateTextArea: '',
       };
     },
+    onUnload() {
+      if (this.timerCloseTime) {
+        clearInterval(this.timerCloseTime);
+        this.timerCloseTime = null;
+      }
+      if (this.timer) {
+        clearInterval(this.timer);
+        this.timer = null;
+      }
+    },
     computed: {
       ...mapState('other', ["nurseDeptSwitchTip"]),
       ...mapState("login", ["loginInfo"]),
@@ -284,7 +294,7 @@
           flex: 1;
           background-color: #f9fafb;
           margin: 0 36rpx 25rpx;
-          border: 1px solid #e5e9ed;
+          @include border;
           color: #333;
           padding: 76rpx 24rpx;
           @include numbersAndLettersNoWrap;
@@ -312,8 +322,8 @@
               font-size: 28rpx;
               color: #666;
               line-height: 40rpx;
-              border-bottom: 2rpx solid #E5E9ED;
               padding: 24rpx;
+              @include border(bottom);
             }
 
             .urgent_textarea {
@@ -322,8 +332,8 @@
               min-height: 212rpx;
               background: #FFFFFF;
               border-radius: 2rpx;
-              border: 2rpx solid #E5E9ED;
               text-align: left;
+              @include border;
 
               ::v-deep .uni-textarea-textarea {
                 padding: 18rpx;
@@ -339,8 +349,8 @@
               font-size: 28rpx;
               color: #666;
               line-height: 40rpx;
-              border-bottom: 2rpx solid #E5E9ED;
               padding: 24rpx 0;
+              @include border(bottom);
             }
 
             .evaluate_list {
@@ -373,8 +383,8 @@
                   min-height: 212rpx;
                   background: #FFFFFF;
                   border-radius: 2rpx;
-                  border: 2rpx solid #E5E9ED;
                   text-align: left;
+                  @include border;
 
                   ::v-deep .uni-textarea-textarea {
                     padding: 18rpx;
@@ -386,15 +396,15 @@
         }
 
         .seiminModel_footer {
-          border-top: 1px solid #e5e5e5;
           height: 100rpx;
           color: #666;
+          @include border(top);
           @include flex(center, center);
 
           .seiminModel_footer__btn {
             height: 100%;
-            @include flex(center, center);
             position: relative;
+            @include flex(center, center);
 
             &::after {
               content: "";

components/seiminPicker/seiminPicker.vue

@@ -114,18 +114,18 @@
   }
 
   .picker-header {
-    @include flex(center, center);
     padding: 20rpx;
-    border-bottom: 1px solid #E5E9ED;
     background-color: #fff;
+    @include flex(center, center);
+    @include border(bottom);
   }
 
   .picker-confirm {
     margin-top: 10rpx;
-    border-top: 1px solid #E5E9ED;
+    background-color: #fff;
     height: 90rpx;
+    @include border(top);
     @include flex(center, center);
-    background-color: #fff;
   }
 
   .packer-title {
@@ -142,7 +142,7 @@
   }
 
   .uni-picker-view-mask {
-    border-bottom: 1px solid #E5E9ED;
+    @include border(bottom);
   }
 
   .picker-item {

pages.json

@@ -33,6 +33,13 @@
         "navigationBarBackgroundColor": "#2C2D31",
         "enablePullDownRefresh": true
       }
+    }, {
+      "path": "pages/orderDetail/orderDetail",
+      "style": {
+        "navigationBarTitleText": "工单详情",
+        "navigationBarBackgroundColor": "#2C2D31"
+      }
+
     }
   ],
   "globalStyle": {

pages/index/index.vue

@@ -536,8 +536,8 @@
             font-size: 32rpx;
             width: 110rpx;
             text-align: center;
-            border-left: 2rpx solid #e5e9ed;
             padding: 6rpx 0;
+            @include border(left);
           }
         }
 
@@ -556,7 +556,7 @@
         height: 88rpx;
         margin-top: 24rpx;
         margin-bottom: 0;
-        border: 1px solid #e5e9ed;
+        @include border;
       }
 
       // 一键收标本
@@ -567,8 +567,8 @@
         margin-top: 8rpx;
         border-radius: 8rpx;
         // box-shadow: 0 0 7rpx 0 rgba(73, 184, 86, 0.09);
-        border: 1px solid #e5e9ed;
         position: relative;
+        @include border;
         @include flex(center, center);
         @include semicircle(#f9fafb);
 
@@ -577,9 +577,9 @@
           height: 48rpx;
           border-radius: 50%;
           background-color: rgba(57, 177, 153, 0.3);
-          border: 1px solid #39b199;
           font-size: 24rpx;
           color: #39b199;
+          @include border($color:#39b199);
           @include flex(center, center);
         }
 
@@ -598,8 +598,8 @@
 
           .collect_row {
             height: 88rpx;
+            @include border($directive:bottom,$style:dashed);
             @include flex(flex-start, center);
-            border-bottom: 1px dashed #e5e9ed;
 
             &:last-of-type {
               border-bottom: none;
@@ -616,6 +616,10 @@
           color: #fff;
           font-size: 32rpx;
           line-height: 88rpx;
+
+          &::after {
+            border: none;
+          }
         }
       }
 
@@ -627,16 +631,16 @@
         margin-top: 8rpx;
         border-radius: 8rpx;
         // box-shadow: 0 0 7rpx 0 rgba(73, 184, 86, 0.09);
-        border: 1px solid #e5e9ed;
         position: relative;
         padding: 0 15rpx;
         font-size: 32rpx;
+        @include border;
         @include semicircle(#f9fafb, 70rpx);
 
         .newOrders_header {
           height: 87rpx;
           padding: 0 27rpx;
-          border-bottom: 1px dashed #e5e9ed;
+          @include border($directive:bottom, $style:dashed);
           @include flex(space-between, center);
 
           .newOrders_header_title {
@@ -651,10 +655,10 @@
         .newOrders_item {
           height: 88rpx;
           padding: 0 27rpx;
-          border-bottom: 1px solid #e5e9ed;
           color: #333;
           font-size: 30rpx;
           position: relative;
+          @include border(bottom);
           @include flex(center, center);
 
           .ji,
@@ -698,16 +702,16 @@
         margin-top: 8rpx;
         border-radius: 8rpx;
         // box-shadow: 0 0 7rpx 0 rgba(73, 184, 86, 0.09);
-        border: 1px solid #e5e9ed;
         position: relative;
         padding: 0 15rpx;
         font-size: 32rpx;
+        @include border;
         @include semicircle(#f9fafb, 70rpx);
 
         .quick_other_header {
           height: 87rpx;
           padding: 0 27rpx;
-          border-bottom: 1px dashed #e5e9ed;
+          @include border($directive:bottom,$style:dashed);
           @include flex(space-between, center);
 
           .quick_other_header_title {

pages/login/login.vue

@@ -176,7 +176,7 @@
 
 				.form_title {
 					@include flex(flex-start, center);
-					width: 140rpx;
+					width: 4em;
 
 					.placeholder {
 						display: inline-block;

pages/orderDetail/orderDetail.vue

@@ -0,0 +1,74 @@
+<template>
+  <view class="orderDetail">
+    <!-- 头部 -->
+    <view class="orderDetail_header">
+      <view class="orderDetail_header_item">
+        工单信息
+      </view>
+      <view class="orderDetail_header_item">
+        流程信息
+      </view>
+      <view class="orderDetail_header_item">
+        业务信息
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import {
+    reqFetchData,
+  } from "../../request/api.js";
+  export default {
+    data() {
+      return {
+        // 工单详情信息
+        orderInfo: {},
+      };
+    },
+    methods: {
+      init(queryParams) {
+        this.getData(queryParams);
+      },
+      //获取详情页数据
+      getData(queryParams) {
+        reqFetchData('api', 'workOrder', queryParams.id).then(res => {
+          if (res.status == 200) {
+            this.orderInfo = res.data;
+          } else {
+            this.$refs.seiminModel.show({
+              skin: 'toast',
+              icon: 'error',
+              content: '请求失败',
+            })
+          }
+        })
+      },
+    },
+    onLoad(queryParams) {
+      console.log(queryParams);
+      this.init(queryParams);
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .orderDetail {
+    padding-bottom: 108rpx;
+
+    .orderDetail_header {
+      height: 88rpx;
+      @include flex;
+
+      .orderDetail_header_item {
+        flex: 1;
+        @include border(right);
+        @include flex(center, center);
+
+        &.active {
+          color: $defaultColor;
+        }
+      }
+    }
+  }
+</style>

pages/orderList/orderList.vue

@@ -13,7 +13,8 @@
     </view>
     <!-- 列表 -->
     <view class="orderList_list">
-      <view class="orderList_listItem" v-for="newOrder in newOrderList" :key="newOrder.id">
+      <view class="orderList_listItem" v-for="newOrder in newOrderList" :key="newOrder.id"
+        @click="toDetail(newOrder.id)">
         <image class="ji" src="../../static/imgs/icon_ji.png" mode="widthFix"
           v-if="newOrder.emergencyType && newOrder.emergencyType.value == 2"></image>
         <image class="jiaji" src="../../static/imgs/icon_jiaji.png" mode="widthFix"
@@ -150,6 +151,12 @@
     },
     methods: {
       ...mapActions("dictionary", ["vxDictionary"]),
+      // 前往工单详情
+      toDetail(id) {
+        uni.navigateTo({
+          url: `/pages/orderDetail/orderDetail?id=${id}`
+        })
+      },
       //评价
       showAppraise(id) {
         this.$refs.seiminModel.show({
@@ -570,18 +577,18 @@
     .orderList_header {
       height: 88rpx;
       background-color: #fff;
-      border-bottom: 1px solid #E5E9ED;
       position: fixed;
       left: 0;
       z-index: 99;
       width: 100%;
+      @include border(bottom);
       @include flex(center, center);
 
       .orderList_header_item {
         flex: 1;
         height: 100%;
         padding: 0 50rpx;
-        border-right: 1px solid #E5E9ED;
+        @include border(right);
         @include flex(space-between, center);
 
         &:last-of-type {
@@ -609,10 +616,10 @@
         background-color: #fff;
         margin-top: 8rpx;
         border-radius: 8rpx;
-        border: 2rpx solid #e5e9ed;
         position: relative;
         padding: 0 24rpx;
         font-size: 32rpx;
+        @include border;
         @include semicircle(#f9fafb, 82rpx);
         @include flex(flex-start, stretch, column);
 
@@ -626,7 +633,7 @@
 
         .orderList_listItem_header {
           height: 86rpx;
-          border-bottom: 2rpx dashed #e5e9ed;
+          @include border(bottom);
           @include flex(space-between, center);
 
           .orderList_listItem_header_title {
@@ -639,10 +646,10 @@
               height: 48rpx;
               border-radius: 50%;
               background-color: #F0F6ED;
-              border: 1px solid #39b199;
               font-size: 24rpx;
               color: #39b199;
               margin-right: 8rpx;
+              @include border($color:#39b199);
               @include flex(center, center);
             }
 
@@ -669,10 +676,10 @@
 
         .orderList_listItem_item {
           height: 88rpx;
-          border-bottom: 1px solid #e5e9ed;
           color: #333;
           font-size: 30rpx;
           flex: 1;
+          @include border(bottom);
           @include flex(flex-start, stretch, column);
 
           &:last-of-type {
@@ -714,9 +721,9 @@
                 position: absolute;
                 right: 0;
                 top: 0;
-                width: 2rpx;
+                width: 1px;
                 height: 100%;
-                border-right: 2rpx solid #fff;
+                @include border(right, #fff);
               }
 
               &:last-of-type::before {

pages/quickCreateOrder/quickCreateOrder.vue

@@ -242,7 +242,7 @@
       },
       // 获取历史输入
       getRecentRemarks(res) {
-        if (res.state == 200) {
+        if (res.state == 200 || res.state == 201) {
           this.historyCustomRemarks = res.data || [];
         } else {
           this.$refs.seiminModel.show({
@@ -365,10 +365,16 @@
       selectDept(type) {
         this.selectdDeptType = type; //存储类型
         if (
-          this.dataObj.start.start.departmentStrategy == 201 ||
-          this.dataObj.start.start.departmentStrategy == 203 ||
-          this.dataObj.end.end.departmentStrategy == 201 ||
-          this.dataObj.end.end.departmentStrategy == 203) {
+          (this.dataObj.start.start.departmentStrategy == 201 ||
+            this.dataObj.start.start.departmentStrategy == 203) &&
+          type === 'start') {
+          //默认科室和固定科室不能选科室
+          return;
+        }
+        if (
+          (this.dataObj.end.end.departmentStrategy == 201 ||
+            this.dataObj.end.end.departmentStrategy == 203 &&
+            type === 'end')) {
           //默认科室和固定科室不能选科室
           return;
         }
@@ -429,8 +435,8 @@
       padding: 0 30rpx;
       height: 88rpx;
       font-size: 34rpx;
-      border-top: 1px solid #e5e5e5;
       background-color: #fff;
+      @include border(top);
       @include flex(space-between, center);
 
       .select_label {
@@ -456,9 +462,9 @@
     .remarks {
       min-height: 150rpx;
       background-color: #fff;
-      border-top: 1px solid #e5e5e5;
-      border-bottom: 1px solid #e5e5e5;
       padding: 22rpx 25rpx;
+      @include border(top);
+      @include border(bottom);
 
       .remarks_textarea {
         width: 100%;

request/api.js

@@ -123,3 +123,9 @@ export const reqEvaluate = (id, postData) =>
     data: postData,
     method: 'POST'
   });
+
+// fetchData查询（通用）
+export const reqFetchData = (type, target, id) =>
+  request({
+    url: `/${type}/fetchData/${target}/${id}`,
+  });

uni.scss

@@ -26,6 +26,29 @@ $textColorYellow: #F5A623;
   align-items: $alignItem;
   flex-direction: $flexDirection;
 }
+// 边框
+// $direction 方向
+@mixin border(
+  $directive: all,
+  $color:#E5E9ED,
+  $style:solid
+) {
+  @if $directive == top {
+      border-top: 1px $style $color;
+  }
+  @else if $directive == right {
+      border-right: 1px $style $color;
+  }
+  @else if $directive == bottom {
+      border-bottom: 1px $style $color;
+  }
+  @else if $directive == left {
+      border-left: 1px $style $color;
+  }
+  @else {
+      border: 1px $style $color;
+  }
+}
 // 按钮背景色
 @mixin btn_background {
   background-image: linear-gradient(90deg,#72c172,#3bb197);
@@ -55,10 +78,10 @@ $textColorYellow: #F5A623;
     height: 32rpx;
     border-radius: 0 16rpx 16rpx 0;
     background-color: $backgroundColor;
-    left: -1px;
+    left: -2rpx;
     top: $top;
     transform: translateY(-50%);
-    border: 1px solid #E5E9ED;
+    @include border;
     border-left: none;
   }
   
@@ -69,10 +92,10 @@ $textColorYellow: #F5A623;
     height: 32rpx;
     border-radius: 16rpx 0 0 16rpx;
     background-color: $backgroundColor;
-    right: -1px;
+    right: -2rpx;
     top: $top;
     transform: translateY(-50%);
-    border: 1px solid #E5E9ED;
+    @include border;
     border-right: none;
   } 
 }