工单列表

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-  "editor.formatOnSave": true,
+  "editor.formatOnSave": false,
   "[vue]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },

components/seiminModel/seiminModel.vue

@@ -9,7 +9,7 @@
   <view class="seiminModel seiminModel_mask" v-if="opts.isVisible">
     <view class="seiminModel_container animate__animated animate__fadeIn animate__faster">
       <!-- 标题 -->
-      <view class="seiminModel_header">
+      <view class="seiminModel_header" :class="{noTitle:!opts.title}">
         <text>{{ opts.title }}</text>
         <text class="seiminModel_countDown" v-if="
             nurseDeptSwitchTip < 0 || (nurseDeptSwitchTip > 0 && closeTime > 0)
@@ -25,11 +25,35 @@
           <view>{{ refreshQRCodeTime }}s</view>
         </view>
       </view>
+      <!-- 加急 -->
+      <view class="seiminModel_content urgent" v-else-if="opts.skin === 'urgent'">
+        <view class="urgent_txt" v-html="opts.content"></view>
+        <textarea :focus="true" class="urgent_textarea" auto-height :maxlength="100"
+          :placeholder-style="placeholderStyle" placeholder="请填写加急原因" v-model="urgentTextArea" />
+      </view>
+      <!-- 评价 -->
+      <view class="seiminModel_content evaluate" v-else-if="opts.skin === 'evaluate'">
+        <view class="evaluate_txt" v-html="opts.content"></view>
+        <view class="evaluate_list">
+          <view class="evaluate_item">
+            <text class="evaluate_label">星级：</text>
+            <view class="evaluate_icons">
+              <text class="pda" :class="star" v-for="(star,i) in stars" :key="i"></text>
+            </view>
+          </view>
+          <view class="evaluate_item">
+            <text class="evaluate_label">评级：</text>
+            <textarea :focus="true" class="evaluate_textarea" auto-height :maxlength="100"
+              :placeholder-style="placeholderStyle" placeholder="请输入..." v-model="urgentTextArea" />
+          </view>
+        </view>
+      </view>
       <!-- 正常弹窗 -->
       <view class="seiminModel_content" v-else>
         <!-- 图标 -->
         <view class="seiminModel_status">
           <text class="pda pda-shibai red" v-if="opts.icon === 'error'"></text>
+          <text class="pda pda-wenhao yellow" v-if="opts.icon === 'warn'"></text>
           <text class="pda pda-duigou green" v-if="opts.icon === 'success'"></text>
         </view>
         <!-- 内容 -->
@@ -71,6 +95,12 @@
         closeTime: 0,
         // 护士科室切换提示自动关闭设置(定时器，单位秒)
         timerCloseTime: null,
+        // 加急原因
+        urgentTextArea: '',
+        // 加急原因的placeholder样式
+        placeholderStyle: 'color:#999;padding:18rpx;',
+        // 星级
+        stars: [],
       };
     },
     computed: {
@@ -80,12 +110,13 @@
     methods: {
       // 显示弹窗
       show(args = {}) {
+        this.stars = ['pda-haoping','pda-haoping','pda-haoping','pda-haoping','pda-haoping']
         // 默认配置项
         let defaultOptions = {
           skin: "default", //弹窗风格(default|toast|qrcode|)
           isVisible: false, //是否显示弹窗
           title: "提示", //标题
-          icon: "success", //图标(success|error|)
+          icon: "success", //图标(success|error|warn|)
           content: "", //内容
           btns: [{
               name: "取消",
@@ -94,8 +125,8 @@
               click: this.close,
             },
             {
-              name: "确定",
+              name: "确认",
-              textColor: "#666",
+              textColor: "#49B856",
               flex: 1,
               click: this.close,
             },
@@ -227,6 +258,10 @@
           position: relative;
           @include flex(center, center);
 
+          &.noTitle {
+            height: 40rpx;
+          }
+
           .seiminModel_countDown {
             position: absolute;
             right: 26rpx;
@@ -244,6 +279,7 @@
           padding: 76rpx 24rpx;
           @include numbersAndLettersNoWrap;
 
+          // 动态二维码
           &.qrcode {
             padding: 24rpx;
             font-size: 32rpx;
@@ -257,6 +293,86 @@
               }
             }
           }
+
+          // 加急
+          &.urgent {
+            padding: 0;
+
+            .urgent_txt {
+              font-size: 28rpx;
+              color: #666;
+              line-height: 40rpx;
+              border-bottom: 2rpx solid #E5E9ED;
+              padding: 24rpx;
+            }
+
+            .urgent_textarea {
+              width: 440rpx;
+              margin: 24rpx;
+              min-height: 212rpx;
+              background: #FFFFFF;
+              border-radius: 2rpx;
+              border: 2rpx solid #E5E9ED;
+              text-align: left;
+
+              ::v-deep .uni-textarea-textarea {
+                padding: 18rpx;
+              }
+            }
+          }
+
+          // 评价
+          &.evaluate {
+            padding: 0;
+
+            .evaluate_txt {
+              font-size: 28rpx;
+              color: #666;
+              line-height: 40rpx;
+              border-bottom: 2rpx solid #E5E9ED;
+              padding: 24rpx 0;
+            }
+
+            .evaluate_list {
+              padding: 20rpx 34rpx;
+
+              .evaluate_item {
+                font-size: 34rpx;
+                color: #666;
+                margin-top: 10rpx;
+                @include flex;
+
+                .evaluate_label {}
+
+                .evaluate_icons {
+                  flex: 1;
+                  @include flex;
+
+                  .pda {
+                    font-size: 40rpx;
+                    margin-right: 10rpx;
+
+                    &.pda-haoping {
+                      color: $defaultColor;
+                    }
+                  }
+                }
+
+                .evaluate_textarea {
+                  flex: 1;
+                  min-height: 212rpx;
+                  background: #FFFFFF;
+                  border-radius: 2rpx;
+                  border: 2rpx solid #E5E9ED;
+                  text-align: left;
+
+                  ::v-deep .uni-textarea-textarea {
+                    padding: 18rpx;
+                  }
+                }
+              }
+            }
+          }
         }
 
         .seiminModel_footer {

components/seiminPicker/seiminPicker.vue

@@ -2,7 +2,7 @@
   <view class="seiminPicker">
     <view class="picker-modal" v-if="showPicker" @click="_close"></view>
     <view class="picker-content" :style="{transform:  showPicker ? 'translateY(0)' : 'translateY(100%)'}">
-      <view class="picker-header">
+      <view class="picker-header" v-if="title">
         <view class="packer-title" :style="{color:titleColor, fontSize:titleFontSize}" v-html="title"></view>
       </view>
       <picker-view indicator-style="height: 90rpx;" class="picker-view" :value="pickerValue" @change="changePicker">

pages/index/index.vue

@@ -42,6 +42,10 @@
           <text class="newOrders_header_more" @click="goToMore">更多&gt;&gt;</text>
         </view>
         <view class="newOrders_item" v-for="newOrder in newOrderList" :key="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"
+            v-if="newOrder.emergencyType && newOrder.emergencyType.value == 3"></image>
           <view class="newOrders_item_time" v-if="newOrder.showCreateTime">{{ newOrder.showCreateTime }}</view>
           <view class="newOrders_item_time" v-else-if="newOrder.yyjdTime && newOrder.gdState.value == 11">
             {{newOrder.yyjdTime | formatDate('MM-dd HH:mm')}}
@@ -183,7 +187,7 @@
             this.ordinaryNum = res.specimenCount.noUrgent;
           }
         } else {
-          this.$refs.seiminModel.showChangeDept({
+          this.$refs.seiminModel.show({
             skin: "toast",
             icon: "error",
             content: res.msg || "获取数据失败",
@@ -226,7 +230,7 @@
             return v;
           });
         } else {
-          this.$refs.seiminModel.showChangeDept({
+          this.$refs.seiminModel.show({
             skin: "toast",
             icon: "error",
             content: res.msg || "获取数据失败",
@@ -253,7 +257,7 @@
           );
           this.specimenTaskTypeId = specimenTaskType && specimenTaskType.id;
         } else {
-          this.$refs.seiminModel.showChangeDept({
+          this.$refs.seiminModel.show({
             skin: "toast",
             icon: "error",
             content: res.msg || "获取数据失败",
@@ -277,7 +281,7 @@
           res.list = res.list || [];
           res.list[0] = res.list[0] || {};
           if (!res.list[0].id) {
-            this.$refs.seiminModel.showChangeDept({
+            this.$refs.seiminModel.show({
               skin: "toast",
               icon: "error",
               content: "无法获取到【护士端科室显示选择】配置,请前往配置",
@@ -286,7 +290,7 @@
           }
           this.changeDeptDisplay(res.list[0].valueconfig);
         } else {
-          this.$refs.seiminModel.showChangeDept({
+          this.$refs.seiminModel.show({
             skin: "toast",
             icon: "error",
             content: res.msg || "无法获取到【护士端科室显示选择】配置,请前往配置",
@@ -310,7 +314,7 @@
           res.list = res.list || [];
           res.list[0] = res.list[0] || {};
           if (!res.list[0].id) {
-            this.$refs.seiminModel.showChangeDept({
+            this.$refs.seiminModel.show({
               skin: "toast",
               icon: "error",
               content: "无法获取到【护士端更新提示】配置,请前往配置",
@@ -319,7 +323,7 @@
           }
           this.changeUpdateTipsForNurses(res.list[0].valueconfig);
         } else {
-          this.$refs.seiminModel.showChangeDept({
+          this.$refs.seiminModel.show({
             skin: "toast",
             icon: "error",
             content: res.msg || "无法获取到【护士端更新提示】配置,请前往配置",
@@ -343,7 +347,7 @@
           res.list = res.list || [];
           res.list[0] = res.list[0] || {};
           if (!res.list[0].id) {
-            this.$refs.seiminModel.showChangeDept({
+            this.$refs.seiminModel.show({
               skin: "toast",
               icon: "error",
               content: "无法获取到【标本按钮文字】配置,请前往配置",
@@ -352,7 +356,7 @@
           }
           this.changeSpecimenButton(res.list[0].valueconfig);
         } else {
-          this.$refs.seiminModel.showChangeDept({
+          this.$refs.seiminModel.show({
             skin: "toast",
             icon: "error",
             content: res.msg || "无法获取到【标本按钮文字】配置,请前往配置",
@@ -376,7 +380,7 @@
           res.list = res.list || [];
           res.list[0] = res.list[0] || {};
           if (!res.list[0].id) {
-            this.$refs.seiminModel.showChangeDept({
+            this.$refs.seiminModel.show({
               skin: "toast",
               icon: "error",
               content: "无法获取到【护士科室切换提示自动关闭设置】配置,请前往配置",
@@ -385,7 +389,7 @@
           }
           this.changeNurseDeptSwitchTip(res.list[0].valueconfig);
         } else {
-          this.$refs.seiminModel.showChangeDept({
+          this.$refs.seiminModel.show({
             skin: "toast",
             icon: "error",
             content: res.msg || "无法获取到【护士科室切换提示自动关闭设置】配置,请前往配置",
@@ -396,7 +400,7 @@
       // 一键收取标本
       collectSpecimens() {
         if (!this.specimenTaskTypeId) {
-          this.$refs.seiminModel.showChangeDept({
+          this.$refs.seiminModel.show({
             skin: "toast",
             icon: "error",
             content: "无法获取到临时标本业务",
@@ -650,8 +654,17 @@
           border-bottom: 1px solid #e5e9ed;
           color: #333;
           font-size: 30rpx;
+          position: relative;
           @include flex(center, center);
 
+          .ji,
+          .jiaji {
+            width: 60rpx;
+            position: absolute;
+            right: 0;
+            top: 0;
+          }
+
           &:last-of-type {
             border-bottom: none;
           }

pages/login/login.vue

@@ -124,7 +124,7 @@
 						});
 						this.changeSeiminModel(true);
 					} else {
-						this.$refs.seiminModel.showChangeDept({
+						this.$refs.seiminModel.show({
 							skin: "toast",
 							icon: "error",
 							content: res.remarks || "登录失败",

pages/orderList/orderList.vue

@@ -14,6 +14,10 @@
     <!-- 列表 -->
     <view class="orderList_list">
       <view class="orderList_listItem" v-for="newOrder in newOrderList" :key="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"
+          v-if="newOrder.emergencyType && newOrder.emergencyType.value == 3"></image>
         <view class="orderList_listItem_header">
           <view class="orderList_listItem_header_title">
             <view class="associationType_icon" v-if="newOrder.isHalfInspect === 1"> 半 </view>
@@ -47,11 +51,31 @@
             <text class="orderList_listItem_item_name" v-else>暂未接单</text>
             <text class="orderList_listItem_item_time" v-if="newOrder.showCreateTime">{{newOrder.showCreateTime}}</text>
             <text class="orderList_listItem_item_time"
-              v-else-if="newOrder.yyjdTime && newOrder.gdState.value == 11">{{newOrder.yyjdTime | formatDate('MM-dd HH:mm')}}</text>
+              v-else-if="newOrder.yyjdTime && newOrder.gdState.value == GDSTATE['定时预约']">{{newOrder.yyjdTime | formatDate('MM-dd HH:mm')}}</text>
           </view>
-          <view class="orderList_listItem_item_btns">
+          <view class="orderList_listItem_item_btns" v-if="
-            <button type="primary" class="btn">撤销</button>
+          newOrder.gdState.value == GDSTATE['待抢单'] ||
-            <button type="primary" class="btn">加急</button>
+          newOrder.gdState.value == GDSTATE['待接单'] ||
+          newOrder.gdState.value == GDSTATE['待到达'] ||
+          newOrder.gdState.value == GDSTATE['定时预约'] ||
+          newOrder.gdState.value == GDSTATE['待评价']
+          ">
+            <button type="primary" class="btn" v-if="newOrder.gdState.value == GDSTATE['待评价']"
+              @click="showAppraise(newOrder.id)">评价</button>
+            <button type="primary" class="btn" v-if="
+            newOrder.gdState.value == GDSTATE['待抢单'] ||
+            newOrder.gdState.value == GDSTATE['待接单'] ||
+            newOrder.gdState.value == GDSTATE['待到达'] ||
+            newOrder.gdState.value == GDSTATE['定时预约']
+            " @click="openRecallModal(newOrder.id)">撤销</button>
+            <button type="primary" class="btn" v-if="newOrder.gdState.value == GDSTATE['定时预约']"
+              @click="openExecModal(newOrder.id)">立即执行</button>
+            <button type="primary" class="btn" v-if="
+            (newOrder.gdState.value == GDSTATE['待抢单'] ||
+            newOrder.gdState.value == GDSTATE['待到达']) &&
+            newOrder.taskType.allowUrgent == 1 &&
+            !newOrder.urgentDetails
+            " @click="showJiaji(newOrder.id)">加急</button>
           </view>
         </view>
       </view>
@@ -71,7 +95,10 @@
     mapActions
   } from "vuex";
   import {
-    reqFetchDataList
+    reqFetchDataList,
+    reqDelWorkOrder,
+    reqUrge,
+    reqDirectStartOrder
   } from "../../request/api.js";
   import {
     GDSTATE
@@ -80,8 +107,13 @@
     name: 'orderList',
     data() {
       return {
+        // 工单状态
+        GDSTATE: GDSTATE,
+        // 当前筛选的工单状态
         selectedGdState: '执行中',
+        // 当前筛选的关联类型
         selectedAssociationType: '全部',
+        //工单状态筛选列表
         gdStates: [{
             value: -1,
             label: '全部'
@@ -94,17 +126,19 @@
             value: 2,
             label: '待评价'
           },
-        ], //工单状态筛选列表
+        ],
+        //关联类型筛选列表
         associationTypes: [{
           value: -1,
           label: '全部'
-        }, ], //关联类型筛选列表
+        }, ],
         newOrderList: [], //工单列表
         totalNum: 0, //工单总数量
         idx: 0, //页码
         pageNum: 20, //每页的工单数量
         pickerList: [], //picker列表
-        type: '',
+        type: '', //打开picker的类型，工单状态||关联类型
+        checkStatus: {}, //审核状态列表
       };
     },
     computed: {
@@ -112,6 +146,183 @@
     },
     methods: {
       ...mapActions("dictionary", ["vxDictionary"]),
+      //评价
+      showAppraise(id) {
+        this.$refs.seiminModel.show({
+          skin: 'evaluate',
+          content: "工单已完成，请对本次服务做出评价！",
+          btns: [{
+              click: () => {
+                console.log('取消');
+                this.$refs.seiminModel.close();
+              }
+            },
+            {
+              click: () => {
+                console.log('确定');
+                this.$refs.seiminModel.close();
+                uni.showLoading({
+                  title: '加载中',
+                  mask: true,
+                })
+                reqDelWorkOrder(id).then(res => {
+                  uni.hideLoading();
+                  if (res.status == 200) {
+                    this.$refs.seiminModel.show({
+                      skin: 'toast',
+                      icon: 'success',
+                      content: '撤销成功',
+                    })
+                    this.init();
+                  } else {
+                    this.$refs.seiminModel.show({
+                      skin: 'toast',
+                      icon: 'error',
+                      content: '撤销失败',
+                    })
+                  }
+                })
+              }
+            }
+          ]
+        });
+      },
+      //撤销
+      openRecallModal(id) {
+        this.$refs.seiminModel.show({
+          icon: "warn",
+          content: "您确认要撤销工单吗？撤销工单我们会通知服务台、支助人员不再执行此工单，请谨慎操作，如确认撤销请点击确认。",
+          btns: [{
+              click: () => {
+                console.log('取消');
+                this.$refs.seiminModel.close();
+              }
+            },
+            {
+              click: () => {
+                console.log('确定');
+                this.$refs.seiminModel.close();
+                uni.showLoading({
+                  title: '加载中',
+                  mask: true,
+                })
+                reqDelWorkOrder(id).then(res => {
+                  uni.hideLoading();
+                  if (res.status == 200) {
+                    this.$refs.seiminModel.show({
+                      skin: 'toast',
+                      icon: 'success',
+                      content: '撤销成功',
+                    })
+                    this.init();
+                  } else {
+                    this.$refs.seiminModel.show({
+                      skin: 'toast',
+                      icon: 'error',
+                      content: '撤销失败',
+                    })
+                  }
+                })
+              }
+            }
+          ]
+        });
+      },
+      //立即执行
+      openExecModal(id) {
+        this.$refs.seiminModel.show({
+          icon: 'warn',
+          content: '您确认要立即执行该工单吗？',
+          btns: [{
+            click: () => {
+              console.log('取消');
+              this.$refs.seiminModel.close();
+            }
+          }, {
+            click: () => {
+              console.log('确认');
+              this.$refs.seiminModel.close();
+              uni.showLoading({
+                title: '加载中',
+                mask: true,
+              })
+              reqDirectStartOrder(id).then(res => {
+                uni.hideLoading();
+                if (res.status == 200) {
+                  this.$refs.seiminModel.show({
+                    skin: 'toast',
+                    icon: 'success',
+                    content: '您的加急申请已成功，调度人员会紧急处理！',
+                  })
+                  this.init();
+                } else {
+                  this.$refs.seiminModel.show({
+                    skin: 'toast',
+                    icon: 'error',
+                    content: '加急失败',
+                  })
+                }
+              })
+            }
+          }, ]
+        })
+      },
+      //加急
+      showJiaji(id) {
+        this.$refs.seiminModel.urgentTextArea = '';
+        this.$refs.seiminModel.show({
+          title: '',
+          skin: 'urgent',
+          content: "请填写加急原因，填写后我们会根据您的诉求优先处理",
+          btns: [{
+              click: () => {
+                console.log('取消');
+                this.$refs.seiminModel.close();
+              }
+            },
+            {
+              click: () => {
+                console.log('确定', this.$refs.seiminModel.urgentTextArea);
+                const urgentTextArea = this.$refs.seiminModel.urgentTextArea;
+                if (urgentTextArea.trim() === '') {
+                  return;
+                }
+                this.$refs.seiminModel.close();
+                uni.showLoading({
+                  title: '加载中',
+                  mask: true,
+                })
+                let postData = {
+                  urgentDetails: {
+                    workerOrder: id,
+                    checkStatus: {
+                      id: this.checkStatus[1]
+                    },
+                    urgentReason: urgentTextArea,
+                  },
+                };
+                reqUrge(postData).then(res => {
+                  uni.hideLoading();
+                  if (res.status == 200) {
+                    this.$refs.seiminModel.show({
+                      skin: 'toast',
+                      icon: 'success',
+                      content: '加急成功',
+                    })
+                    this.init();
+                  } else {
+                    this.$refs.seiminModel.show({
+                      skin: 'toast',
+                      icon: 'error',
+                      content: '加急失败',
+                    })
+                  }
+                })
+              }
+            }
+          ]
+        });
+      },
       //关闭
       closePicker() {
         this.$refs.sPicker._close();
@@ -157,12 +368,14 @@
         });
         Promise.all([
           this.queryWorkOrdersRequest(), //查询最新工单列表
-          this.queryDictionary('association_types'), //获取数据字典
+          this.queryDictionary('association_types'), //获取数据字典-关联类型
+          this.queryDictionary('check_status'), //获取数据字典-审核状态
         ]).then((values) => {
           uni.hideLoading();
           uni.stopPullDownRefresh();
           this.queryWorkOrdersResponse(values[0]);
           this.queryDictionaryResponse(values[1], 'association_types');
+          this.queryDictionaryResponse(values[2], 'check_status');
         });
       },
       // 查询最新工单列表（上拉）
@@ -258,7 +471,7 @@
             this.newOrderList = newOrderList;
           }
         } else {
-          this.$refs.seiminModel.showChangeDept({
+          this.$refs.seiminModel.show({
             skin: "toast",
             icon: "error",
             content: res.msg || "获取数据失败",
@@ -276,9 +489,11 @@
       },
       // 获取数据字典
       queryDictionaryResponse(res, type) {
+        let obj = {};
+        let arr = [];
         switch (type) {
           case 'association_types':
-            let arr = res.map(v => ({
+            arr = res.map(v => ({
               value: v.id,
               label: v.name
             }));
@@ -287,6 +502,13 @@
               value: -1
             }, ...arr];
             break;
+          case 'check_status':
+            obj = {};
+            res.forEach(v => {
+              obj[v.value] = v.id;
+            })
+            this.checkStatus = obj;
+            break;
         }
       },
     },
@@ -353,14 +575,22 @@
         border-radius: 8rpx;
         border: 2rpx solid #e5e9ed;
         position: relative;
-        padding: 0 15rpx;
+        padding: 0 24rpx;
         font-size: 32rpx;
         @include semicircle(#f9fafb, 82rpx);
         @include flex(flex-start, stretch, column);
 
+        .ji,
+        .jiaji {
+          width: 60rpx;
+          position: absolute;
+          right: 0;
+          top: 0;
+        }
+
         .orderList_listItem_header {
           height: 86rpx;
-          border-bottom: 1px dashed #e5e9ed;
+          border-bottom: 2rpx dashed #e5e9ed;
           @include flex(space-between, center);
 
           .orderList_listItem_header_title {
@@ -431,7 +661,7 @@
 
           .orderList_listItem_item_btns {
             position: relative;
-            left: -14rpx;
+            left: -24rpx;
             width: 698rpx;
             height: 88rpx;
             @include btn_background;
@@ -440,9 +670,19 @@
             .btn {
               flex: 1;
               background-color: transparent;
-              border-right: 2rpx solid #fff;
+              position: relative;
+
+              &::before {
+                content: '';
+                position: absolute;
+                right: 0;
+                top: 0;
+                width: 2rpx;
+                height: 100%;
+                border-right: 2rpx solid #fff;
+              }
 
-              &:last-of-type {
+              &:last-of-type::before {
                 border-right: none;
               }
 

pages/quickCreateOrder/quickCreateOrder.vue

@@ -232,7 +232,7 @@
           }
           this.dataObj = res;
         } else {
-          this.$refs.seiminModel.showChangeDept({
+          this.$refs.seiminModel.show({
             skin: "toast",
             icon: "error",
             content: res.msg || "获取数据失败",
@@ -245,7 +245,7 @@
         if (res.state == 200) {
           this.historyCustomRemarks = res.data || [];
         } else {
-          this.$refs.seiminModel.showChangeDept({
+          this.$refs.seiminModel.show({
             skin: "toast",
             icon: "error",
             content: res.msg || "获取数据失败",
@@ -286,7 +286,7 @@
           }]; //终点科室
           // 验证起点科室和终点科室必填
           if (!startDept.id) {
-            this.$refs.seiminModel.showChangeDept({
+            this.$refs.seiminModel.show({
               skin: "toast",
               icon: "error",
               content: "请选择起点科室",
@@ -295,7 +295,7 @@
             return;
           }
           if (!endDepts[0].id) {
-            this.$refs.seiminModel.showChangeDept({
+            this.$refs.seiminModel.show({
               skin: "toast",
               icon: "error",
               content: "请选择终点科室",
@@ -321,7 +321,7 @@
         reqBuildOrder(postData).then((res) => {
           uni.hideLoading();
           if (res.status == 200) {
-            this.$refs.seiminModel.showChangeDept({
+            this.$refs.seiminModel.show({
               skin: "toast",
               content: "创建成功",
               btns: [{
@@ -336,7 +336,7 @@
               }, ],
             });
           } else {
-            this.$refs.seiminModel.showChangeDept({
+            this.$refs.seiminModel.show({
               skin: "toast",
               icon: "error",
               content: res.msg || "建单失败",

pages/searchDept/searchDept.vue

@@ -189,7 +189,7 @@
               keyword
             );
           } else {
-            this.$refs.seiminModel.showChangeDept({
+            this.$refs.seiminModel.show({
               skin: "toast",
               icon: "error",
               content: res.msg || "获取数据失败",
@@ -332,7 +332,7 @@
                 this.changeDept_index_handler_common();
               } else {
                 uni.hideLoading();
-                this.$refs.seiminModel.showChangeDept({
+                this.$refs.seiminModel.show({
                   skin: "toast",
                   icon: "error",
                   content: res.msg || "操作失败",
@@ -359,7 +359,7 @@
             reqGetCurrentUser().then((res) => {
               uni.hideLoading();
               if (res.status == 200) {
-                this.$refs.seiminModel.showChangeDept({
+                this.$refs.seiminModel.show({
                   skin: "toast",
                   icon: "success",
                   content: "切换科室成功",
@@ -374,7 +374,7 @@
                   }, ],
                 });
               } else {
-                this.$refs.seiminModel.showChangeDept({
+                this.$refs.seiminModel.show({
                   skin: "toast",
                   icon: "error",
                   content: res.msg || "操作失败",
@@ -384,7 +384,7 @@
             });
           } else {
             uni.hideLoading();
-            this.$refs.seiminModel.showChangeDept({
+            this.$refs.seiminModel.show({
               skin: "toast",
               icon: "error",
               content: res.msg || "操作失败",

request/api.js

@@ -95,3 +95,23 @@ export const reqGetCurrentUser = () =>
   request({
     url: '/user/data/getCurrentUser',
   });
+
+// 撤回
+export const reqDelWorkOrder = (orderId) =>
+  request({
+    url: `/workerOrder/delWorkOrder/${orderId}`,
+  });
+
+// 加急
+export const reqUrge = (postData) =>
+  request({
+    url: `/workerOrder/urge`,
+    data: postData,
+    method: 'POST'
+  });
+
+// 立即执行
+export const reqDirectStartOrder = (id) =>
+  request({
+    url: `/api/directStartOrder/${id}`,
+  });

static/fonts/demo_index.html

@@ -55,6 +55,24 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon pda">&#xe612;</span>
+                <div class="name">好评</div>
+                <div class="code-name">&amp;#xe612;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon pda">&#xe640;</span>
+                <div class="name">好评</div>
+                <div class="code-name">&amp;#xe640;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon pda">&#xe7d2;</span>
+                <div class="name">问好</div>
+                <div class="code-name">&amp;#xe7d2;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon pda">&#xe68f;</span>
                 <div class="name">下拉</div>
                 <div class="code-name">&amp;#xe68f;</div>
@@ -132,9 +150,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'pda';
-  src: url('iconfont.woff2?t=1650447797513') format('woff2'),
+  src: url('iconfont.woff2?t=1651040512454') format('woff2'),
-       url('iconfont.woff?t=1650447797513') format('woff'),
+       url('iconfont.woff?t=1651040512454') format('woff'),
-       url('iconfont.ttf?t=1650447797513') format('truetype');
+       url('iconfont.ttf?t=1651040512454') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -161,6 +179,33 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon pda pda-haoping"></span>
+            <div class="name">
+              好评
+            </div>
+            <div class="code-name">.pda-haoping
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon pda pda-haoping1"></span>
+            <div class="name">
+              好评
+            </div>
+            <div class="code-name">.pda-haoping1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon pda pda-wenhao"></span>
+            <div class="name">
+              问好
+            </div>
+            <div class="code-name">.pda-wenhao
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon pda pda-xiala"></span>
             <div class="name">
               下拉
@@ -279,6 +324,30 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#pda-haoping"></use>
+                </svg>
+                <div class="name">好评</div>
+                <div class="code-name">#pda-haoping</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#pda-haoping1"></use>
+                </svg>
+                <div class="name">好评</div>
+                <div class="code-name">#pda-haoping1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#pda-wenhao"></use>
+                </svg>
+                <div class="name">问好</div>
+                <div class="code-name">#pda-wenhao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#pda-xiala"></use>
                 </svg>
                 <div class="name">下拉</div>

static/fonts/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "pda"; /* Project id 3307922 */
-  src: url('/static/fonts/iconfont.woff2?t=1650447797513') format('woff2'),
+  src: url('/static/fonts/iconfont.woff2?t=1651040512454') format('woff2'),
-       url('/static/fonts/iconfont.woff?t=1650447797513') format('woff'),
+       url('/static/fonts/iconfont.woff?t=1651040512454') format('woff'),
-       url('/static/fonts/iconfont.ttf?t=1650447797513') format('truetype');
+       url('/static/fonts/iconfont.ttf?t=1651040512454') format('truetype');
 }
 
 .pda {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.pda-haoping:before {
+  content: "\e612";
+}
+
+.pda-haoping1:before {
+  content: "\e640";
+}
+
+.pda-wenhao:before {
+  content: "\e7d2";
+}
+
 .pda-xiala:before {
   content: "\e68f";
 }

static/fonts/iconfont.json

@@ -6,6 +6,27 @@
   "description": "转运PDA",
   "glyphs": [
     {
+      "icon_id": "398877",
+      "name": "好评",
+      "font_class": "haoping",
+      "unicode": "e612",
+      "unicode_decimal": 58898
+    },
+    {
+      "icon_id": "1351206",
+      "name": "好评",
+      "font_class": "haoping1",
+      "unicode": "e640",
+      "unicode_decimal": 58944
+    },
+    {
+      "icon_id": "6771223",
+      "name": "问好",
+      "font_class": "wenhao",
+      "unicode": "e7d2",
+      "unicode_decimal": 59346
+    },
+    {
       "icon_id": "704337",
       "name": "下拉",
       "font_class": "xiala",