优化

components/seiminModel/seiminModel.vue

@@ -2,7 +2,7 @@
  * @Author: 廖明明
  * @Date: 2022-04-01 17:11:19
  * @LastEditors: 廖明明
- * @LastEditTime: 2022-04-02 17:03:14
+ * @LastEditTime: 2022-04-21 12:27:12
  * @Description: 自定义弹窗组件
 -->
 <template>
@@ -11,7 +11,9 @@
       <!-- 标题 -->
       <view class="seiminModel_header">
         <text>{{ opts.title }}</text>
-        <text class="seiminModel_countDown" v-if="nurseDeptSwitchTip < 0 || (nurseDeptSwitchTip > 0 && closeTime > 0)">
+        <text class="seiminModel_countDown" v-if="
+            nurseDeptSwitchTip < 0 || (nurseDeptSwitchTip > 0 && closeTime > 0)
+          ">
           <text v-if="nurseDeptSwitchTip < 0">关闭</text>倒计时<text>{{ closeTime }}s</text>
         </text>
       </view>
@@ -19,9 +21,7 @@
       <view class="seiminModel_content qrcode" v-if="opts.skin === 'qrcode'">
         <image class="w100" :src="nurseCodeImg" mode="widthFix"></image>
         <view class="qrcode_operate">
-          <view class="refreshQRCode" @click="showNurseCode">
-            刷新
-          </view>
+          <view class="refreshQRCode" @click="showNurseCode"> 刷新 </view>
           <view>{{ refreshQRCodeTime }}s</view>
         </view>
       </view>
@@ -36,7 +36,9 @@
         <view class="seiminModel_txt" v-html="opts.content"></view>
       </view>
       <!-- 底部 -->
-      <view class="seiminModel_footer" v-if="nurseDeptSwitchTip <= 0 || (nurseDeptSwitchTip > 0 && closeTime === 0)">
+      <view class="seiminModel_footer" v-if="
+          nurseDeptSwitchTip <= 0 || (nurseDeptSwitchTip > 0 && closeTime === 0)
+        ">
         <view class="seiminModel_footer__btn" v-for="(btn, i) in opts.btns" :style="{
             flex: btn.flex,
             color: btn.textColor,
@@ -49,10 +51,10 @@
 <script>
   import {
     mapState
-  } from 'vuex';
+  } from "vuex";
   import {
     reqDeptCodes
-  } from '../../request/api.js';
+  } from "../../request/api.js";
   export default {
     name: "seiminModel",
     data() {
@@ -62,7 +64,7 @@
         // 动态二维码定时器
         timer: null,
         // 动态二维码qrcode
-        nurseCodeImg: '',
+        nurseCodeImg: "",
         // 动态二维码刷新间隔时长
         refreshQRCodeTime: 30,
         // 护士科室切换提示自动关闭设置(时长，单位秒)
@@ -72,8 +74,8 @@
       };
     },
     computed: {
-      ...mapState(['nurseDeptSwitchTip']),
-      ...mapState('user', ['loginInfo']),
+      ...mapState(["nurseDeptSwitchTip"]),
+      ...mapState("user", ["loginInfo"]),
     },
     methods: {
       // 显示弹窗
@@ -83,19 +85,19 @@
           skin: "default", //弹窗风格(default|toast|qrcode|)
           isVisible: false, //是否显示弹窗
           title: "提示", //标题
-          icon:'success',//图标(success|error|)
+          icon: "success", //图标(success|error|)
           content: "", //内容
           btns: [{
               name: "取消",
               textColor: "#666",
               flex: 1,
-              click: this.close
+              click: this.close,
             },
             {
               name: "确定",
               textColor: "#666",
               flex: 1,
-              click: this.close
+              click: this.close,
             },
           ], //弹窗按钮
         };
@@ -115,7 +117,7 @@
           let btns = [];
           args.btns.forEach((v, i) => {
             btns.push(Object.assign({}, defaultOptions.btns[i], v));
-          })
+          });
           args.btns = btns;
         }
         // 合并配置
@@ -123,14 +125,14 @@
           isVisible: true,
         });
         // 如果是动态二维码,则需要发起请求
-        if (this.opts.skin === 'qrcode') {
+        if (this.opts.skin === "qrcode") {
           this.showNurseCode();
         }
       },
       // 关闭弹窗
       close() {
         this.opts.isVisible = false;
-        if (this.opts.skin === 'qrcode') {
+        if (this.opts.skin === "qrcode") {
           clearInterval(this.timer);
           this.timer = null;
         }
@@ -138,7 +140,7 @@
       // 科室动态二维码方法
       showNurseCode() {
         let deptId = this.loginInfo.user && this.loginInfo.user.dept.id;
-        reqDeptCodes([deptId]).then(res => {
+        reqDeptCodes([deptId]).then((res) => {
           if (res.status == 200) {
             this.nurseCodeImg = res["data"][0].base64;
             this.refreshQRCodeTime = res["data"][0].refreshQRCodeTime;
@@ -150,8 +152,14 @@
                 this.showNurseCode();
               }
             }, 1000);
+          } else {
+            clearInterval(this.timer);
+            uni.showToast({
+              icon: 'none',
+              title: '获取数据失败'
+            })
           }
-        })
+        });
       },
       // 切换科室弹窗
       showChangeDept(options = {}) {
@@ -173,8 +181,8 @@
             clearInterval(this.timerCloseTime);
           }
         }, 1000);
-      }
-    }
+      },
+    },
   };
 </script>
 

pages.json

@@ -30,7 +30,8 @@
       "path": "pages/orderList/orderList",
       "style": {
         "navigationBarTitleText": "工单列表",
-        "navigationBarBackgroundColor": "#2C2D31"
+        "navigationBarBackgroundColor": "#2C2D31",
+        "enablePullDownRefresh": true
       }
     }
   ],

pages/login/login.vue

@@ -111,10 +111,12 @@
             });
             this.changeSeiminModel(true);
           } else {
-            uni.showToast({
-              icon: "none",
-              title: res.remarks || "登录失败",
+            this.$refs.seiminModel.showChangeDept({
+              skin: "toast",
+              icon: "error",
+              content: res.remarks || "登录失败",
             });
+            throw new Error(res.remarks || '登录失败');
           }
         });
       },

pages/orderList/orderList.vue

@@ -3,32 +3,294 @@
     <!-- 头部筛选 -->
     <view class="orderList_header">
       <view class="orderList_header_item">
-        
+        <text class="orderList_header_itemText">全部</text>
+        <text class="pda pda-xiala"></text>
       </view>
       <view class="orderList_header_item">
-        
+        <text class="orderList_header_itemText">全部</text>
+        <text class="pda pda-xiala"></text>
+      </view>
+    </view>
+    <!-- 列表 -->
+    <view class="orderList_list">
+      <view class="orderList_listItem" v-for="newOrder in newOrderList" :key="newOrder.id">
+        <view class="orderList_listItem_header">
+          <view class="orderList_listItem_header_title">
+            <view class="associationType_icon"> 标 </view>
+            半程陪检-张三
+          </view>
+          <text class="orderList_listItem_header_more">待接单</text>
+        </view>
+        <view class="orderList_listItem_item">
+          <view class="orderList_listItem_item_content">
+            <text class="orderList_listItem_item_name">李四-6322285</text>
+            <text class="orderList_listItem_item_time">10:20</text>
+          </view>
+          <view class="orderList_listItem_item_btns">
+            <button type="primary" class="btn">撤销</button>
+            <button type="primary" class="btn">加急</button>
+          </view>
+        </view>
       </view>
     </view>
     <seiminFooterNav></seiminFooterNav>
+    <seiminModel ref="seiminModel"></seiminModel>
   </view>
 </template>
 
 <script>
+  import {
+    mapState
+  } from "vuex";
+  import {
+    reqFetchDataList
+  } from "../../request/api.js";
+  import {
+    GDSTATE
+  } from "../../utils/enum.gdstate.js";
   export default {
     name: 'orderList',
     data() {
       return {
-
+        newOrderList: [], //工单列表
+        idx: 0, //页码
       };
+    },
+    computed: {
+      ...mapState("user", ["loginInfo"]),
+    },
+    methods: {
+      // 获取页面数据
+      init() {
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        Promise.all([
+          this.queryWorkOrdersRequest(), //查询最新工单列表
+        ]).then((values) => {
+          uni.hideLoading();
+          uni.stopPullDownRefresh();
+          this.queryWorkOrdersResponse(values[0]);
+        });
+      },
+      // 查询最新工单列表（上拉）
+      reachBottom() {
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        Promise.all([
+          this.queryWorkOrdersRequest(true), //查询最新工单列表
+        ]).then((values) => {
+          uni.hideLoading();
+          uni.stopPullDownRefresh();
+          this.queryWorkOrdersResponse(values[0], true);
+        });
+      },
+      // 查询最新工单列表
+      queryWorkOrdersRequest(idxPlus = false) {
+        if (idxPlus) {
+          //累加
+          ++this.idx;
+        } else {
+          this.idx = 0;
+        }
+        return reqFetchDataList("nurse", "workOrder", {
+          workOrder: {
+            createDept: this.loginInfo.user.dept.id,
+            platform: 2,
+            searchDays: 2,
+          },
+          idx: this.idx,
+          sum: 10,
+        });
+      },
+      // 查询最新工单列表
+      queryWorkOrdersResponse(res, idxPlus = false) {
+        if (res.status == 200) {
+          res.list = res.list || [];
+          let newOrderList = res.list.map((v) => {
+            if (v.gdState) {
+              if (
+                v.gdState.value == GDSTATE["待接单"] ||
+                v.gdState.value == GDSTATE["待抢单"]
+              ) {
+                v.stateTextClass = "red";
+              } else if (
+                v.gdState.value == GDSTATE["待评价"] ||
+                v.gdState.value == GDSTATE["已完成"]
+              ) {
+                v.stateTextClass = "green";
+              } else {
+                v.stateTextClass = "yellow";
+              }
+            }
+            return v;
+          });
+          if (idxPlus) {
+            //累加
+            this.newOrderList.push(newOrderList)
+          } else {
+            this.newOrderList = newOrderList;
+          }
+        } else {
+          this.$refs.seiminModel.showChangeDept({
+            skin: "toast",
+            icon: "error",
+            content: res.msg || "获取数据失败",
+          });
+          throw new Error(res.msg || '获取数据失败');
+        }
+      },
+    },
+    mounted() {
+      this.init();
+    },
+    onPullDownRefresh() {
+      this.init();
+    },
+    onReachBottom() {
+      this.reachBottom();
     }
   }
 </script>
 
 <style lang="scss" scoped>
   .orderList {
+    padding-top: 88rpx;
+    padding-bottom: 108rpx;
+
+    // 头部筛选
     .orderList_header {
       height: 88rpx;
+      background-color: #fff;
+      border-bottom: 1px solid #E5E9ED;
+      position: fixed;
+      top: 88rpx;
+      left: 0;
+      z-index: 99;
+      width: 100%;
       @include flex(center, center);
+
+      .orderList_header_item {
+        flex: 1;
+        height: 100%;
+        padding: 0 50rpx;
+        border-right: 1px solid #E5E9ED;
+        @include flex(space-between, center);
+
+        &:last-of-type {
+          border-right: none;
+        }
+
+        .orderList_header_itemText {
+          color: #333;
+          font-size: 38rpx;
+        }
+
+        .pda-xiala {
+          color: #DDE1E5;
+        }
+      }
+    }
+
+    // 列表
+    .orderList_list {
+      padding: 0 24rpx;
+
+      .orderList_listItem {
+        width: 702rpx;
+        min-height: 320rpx;
+        background-color: #fff;
+        margin-top: 8rpx;
+        border-radius: 8rpx;
+        border: 2rpx solid #e5e9ed;
+        position: relative;
+        padding: 0 15rpx;
+        font-size: 32rpx;
+        @include semicircle(#f9fafb, 82rpx);
+        @include flex(flex-start, stretch, column);
+
+        .orderList_listItem_header {
+          height: 86rpx;
+          border-bottom: 1px dashed #e5e9ed;
+          @include flex(space-between, center);
+
+          .orderList_listItem_header_title {
+            color: #333;
+            @include flex(flex-start, center);
+
+            .associationType_icon {
+              width: 48rpx;
+              height: 48rpx;
+              border-radius: 50%;
+              background-color: rgba(57, 177, 153, 0.3);
+              border: 1px solid #39b199;
+              font-size: 24rpx;
+              color: #39b199;
+              margin-right: 8rpx;
+              @include flex(center, center);
+            }
+          }
+
+          .orderList_listItem_header_more {
+            color: #666;
+          }
+        }
+
+        .orderList_listItem_item {
+          height: 88rpx;
+          border-bottom: 1px solid #e5e9ed;
+          color: #333;
+          font-size: 30rpx;
+          flex: 1;
+          @include flex(flex-start, stretch, column);
+
+          &:last-of-type {
+            border-bottom: none;
+          }
+
+          .orderList_listItem_item_content {
+            min-height: 143rpx;
+            flex: 1;
+            @include flex(space-between, center);
+
+            .orderList_listItem_item_name {
+              font-size: 38rpx;
+              font-weight: bold;
+            }
+
+            .orderList_listItem_item_time {
+              color: #666;
+              font-size: 28rpx;
+            }
+          }
+
+          .orderList_listItem_item_btns {
+            position: relative;
+            left: -14rpx;
+            width: 698rpx;
+            height: 88rpx;
+            @include btn_background;
+            @include flex;
+
+            .btn {
+              flex: 1;
+              background-color: transparent;
+              border-right: 2rpx solid #fff;
+
+              &:last-of-type {
+                border-right: none;
+              }
+
+              &::after {
+                border: none;
+              }
+            }
+          }
+        }
+      }
     }
   }
 </style>

pages/quickCreateOrder/quickCreateOrder.vue

@@ -230,12 +230,26 @@
             }
           }
           this.dataObj = res;
+        } else {
+          this.$refs.seiminModel.showChangeDept({
+            skin: "toast",
+            icon: "error",
+            content: res.msg || "获取数据失败",
+          });
+          throw new Error(res.msg || '获取数据失败');
         }
       },
       // 获取历史输入
       getRecentRemarks(res) {
         if (res.state == 200) {
           this.historyCustomRemarks = res.data || [];
+        } else {
+          this.$refs.seiminModel.showChangeDept({
+            skin: "toast",
+            icon: "error",
+            content: res.msg || "获取数据失败",
+          });
+          throw new Error(res.msg || '获取数据失败');
         }
       },
       // 提交数据,建单
@@ -324,8 +338,9 @@
             this.$refs.seiminModel.showChangeDept({
               skin: "toast",
               icon: "error",
-              content: res.msg || "操作失败",
+              content: res.msg || "建单失败",
             });
+            throw new Error(res.msg || '建单失败');
           }
         });
       },

pages/searchDept/searchDept.vue

@@ -161,6 +161,7 @@
           mask: true,
         });
         reqFetchDataList("data", "department", postData).then((res) => {
+          uni.hideLoading();
           if (res.status == 200) {
             this.searchData.push({
               name: keyword,
@@ -177,7 +178,13 @@
               this.deptList,
               keyword
             );
-            uni.hideLoading();
+          } else {
+            this.$refs.seiminModel.showChangeDept({
+              skin: "toast",
+              icon: "error",
+              content: res.msg || "获取数据失败",
+            });
+            throw new Error(res.msg || '获取数据失败');
           }
         });
       },
@@ -318,6 +325,7 @@
                   icon: "error",
                   content: res.msg || "操作失败",
                 });
+                throw new Error(res.msg || '操作失败');
               }
             });
           }
@@ -359,6 +367,7 @@
                   icon: "error",
                   content: res.msg || "操作失败",
                 });
+                throw new Error(res.msg || '操作失败');
               }
             });
           } else {
@@ -368,6 +377,7 @@
               icon: "error",
               content: res.msg || "操作失败",
             });
+            throw new Error(res.msg || '操作失败');
           }
         });
       },