工单详情的工单信息

filters/index.js

@@ -10,5 +10,5 @@ Vue.filter('specimenNum', function(value) {
 // 格式化日期
 // YYYY-MM-DD HH:mm:ss
 Vue.filter('formatDate', function(value, ruleText) {
-  return format(new Date(value), ruleText);
+  return value ? format(new Date(value), ruleText) : '';
 })

pages/orderDetail/orderDetail.vue

@@ -2,16 +2,122 @@
   <view class="orderDetail">
     <!-- 头部 -->
     <view class="orderDetail_header">
-      <view class="orderDetail_header_item">
-        工单信息
+      <view class="orderDetail_header_item" v-for="tab in tabs" :key="tab.id" :class="{active:tab.id === selectedTab}"
+        @click="changeTab(tab.id)">
+        {{tab.name}}
       </view>
-      <view class="orderDetail_header_item">
-        流程信息
-      </view>
-      <view class="orderDetail_header_item">
-        业务信息
+    </view>
+    <!-- tab -->
+    <!-- 工单信息 -->
+    <view class="orderDetail_info">
+      <view class="orderDetail_infoItem" v-if="orderInfo.id">
+        <view class="orderDetail_infoItem_header">
+          <view class="orderDetail_infoItem_header_title">
+            <view class="icon"></view>
+            <view class="taskNameAndWorkerName">
+              <text class="taskName"
+                v-if="orderInfo.taskType">{{orderInfo.isHalfInspect === 1? "半程陪检": orderInfo.taskType.taskName}}</text>
+            </view>
+          </view>
+          <text class="orderDetail_infoItem_header_more">{{orderInfo.gdcode}}</text>
+        </view>
+        <view class="orderDetail_infoItem_item">
+          <view class="orderDetail_infoItem_item_content">
+            <text class="orderDetail_infoItem_item_name">状态</text>
+            <text class="orderDetail_infoItem_item_value" v-if="orderInfo.gdState">{{orderInfo.gdState.name}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content">
+            <text class="orderDetail_infoItem_item_name">工单日期</text>
+            <text class="orderDetail_infoItem_item_value">{{orderInfo.startTime || '暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content">
+            <text class="orderDetail_infoItem_item_name">总耗时</text>
+            <text class="orderDetail_infoItem_item_value">{{orderInfo.showTimeNum || '暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content">
+            <text class="orderDetail_infoItem_item_name">申请科室</text>
+            <text
+              class="orderDetail_infoItem_item_value">{{orderInfo.createDeptDTO?(deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content">
+            <text class="orderDetail_infoItem_item_name">起点科室</text>
+            <text
+              class="orderDetail_infoItem_item_value">{{orderInfo.startDept?(deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept):'暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content"
+            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者其他服务业务']">
+            <text class="orderDetail_infoItem_item_name">中间科室</text>
+            <text class="orderDetail_infoItem_item_value">{{orderInfo.middleDept || '暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content">
+            <text class="orderDetail_infoItem_item_name">目标科室</text>
+            <text class="orderDetail_infoItem_item_value">{{orderInfo.endDepts}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content">
+            <text class="orderDetail_infoItem_item_name">支助人员</text>
+            <text class="orderDetail_infoItem_item_value">{{orderInfo.worker?orderInfo.worker.name:'暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content">
+            <text class="orderDetail_infoItem_item_name">联系电话</text>
+            <text class="orderDetail_infoItem_item_value">{{orderInfo.worker?orderInfo.worker.phone:'暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content"
+            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者其他服务业务']">
+            <text class="orderDetail_infoItem_item_name">陪同情况</text>
+            <text class="orderDetail_infoItem_item_value">{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content"
+            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者其他服务业务']">
+            <text class="orderDetail_infoItem_item_name">预约时间</text>
+            <text
+              class="orderDetail_infoItem_item_value">{{orderInfo.yyjdTime?(orderInfo.yyjdTime|formatDate('MM-dd HH:mm')):'暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content"
+            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']">
+            <text class="orderDetail_infoItem_item_name">是否半程陪检</text>
+            <text class="orderDetail_infoItem_item_value">{{orderInfo.isHalfInspect===1?'是':'否'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content"
+            v-if="orderInfo.drugs && orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['药品配送业务']">
+            <text class="orderDetail_infoItem_item_name">药包编码</text>
+            <text class="orderDetail_infoItem_item_value">{{orderInfo.drugs.packid || '暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content"
+            v-if="orderInfo.staticDistri && orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['静配配送']">
+            <text class="orderDetail_infoItem_item_name">药包编码</text>
+            <text class="orderDetail_infoItem_item_value">{{orderInfo.staticDistri.packid || '暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content"
+            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['临时标本业务'] || orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['标本轮巡业务']">
+            <text class="orderDetail_infoItem_item_name">预计接收</text>
+            <text class="orderDetail_infoItem_item_value">{{orderInfo.expectReceiveNum||'暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content"
+            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['临时标本业务'] || orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['标本轮巡业务']">
+            <text class="orderDetail_infoItem_item_name">实际接收</text>
+            <text class="orderDetail_infoItem_item_value">{{orderInfo.actualReceiveNum||'暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content">
+            <text class="orderDetail_infoItem_item_name">是否加急</text>
+            <text class="orderDetail_infoItem_item_value" v-if="orderInfo.emergencyType">
+              {{(orderInfo.emergencyType.value == 2 || orderInfo.emergencyType.value == 3)?'是':'否'}}
+            </text>
+          </view>
+          <view class="orderDetail_infoItem_item_content"
+            v-if="orderInfo.workOrderRemark && (orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['临时标本业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['标本轮巡业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['其他临床服务'])">
+            <text class="orderDetail_infoItem_item_name">备注信息</text>
+            <text class="orderDetail_infoItem_item_value">{{orderInfo.workOrderRemark||'暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content" v-if="orderInfo.specialCloseReason">
+            <text class="orderDetail_infoItem_item_name">特殊情况关闭原因</text>
+            <text class="orderDetail_infoItem_item_value">{{orderInfo.specialCloseReason||'暂无'}}</text>
+          </view>
+        </view>
       </view>
     </view>
+    <!-- 底部 -->
+    <seiminFooterBtn :btns="btns"></seiminFooterBtn>
+    <seiminModel ref="seiminModel"></seiminModel>
   </view>
 </template>
 
@@ -19,23 +125,180 @@
   import {
     reqFetchData,
   } from "../../request/api.js";
+  import {
+    mapState
+  } from "vuex";
+  import {
+    GDSTATE
+  } from "../../utils/enum.gdstate.js";
+  import {
+    ASSOCIATION_TYPES
+  } from "../../utils/enum.association_types.js";
+  import {
+    showAppraise,
+    openRecallModal,
+    openExecModal,
+    showJiaji,
+  } from "../../utils/index.js";
   export default {
     data() {
       return {
+        // 关联类型
+        ASSOCIATION_TYPES,
+        // 选项卡
+        tabs: [{
+            id: 1,
+            name: '工单信息'
+          },
+          {
+            id: 2,
+            name: '流程信息'
+          },
+          {
+            id: 3,
+            name: '业务信息'
+          },
+        ],
+        // 当前选中的tab
+        selectedTab: 1,
         // 工单详情信息
         orderInfo: {},
+        //底部按钮
+        btns: [],
       };
     },
+    computed: {
+      ...mapState('other', ["deptDisplay"]),
+    },
     methods: {
       init(queryParams) {
         this.getData(queryParams);
       },
+      // 切换tab
+      changeTab(id) {
+        this.selectedTab = id;
+      },
       //获取详情页数据
       getData(queryParams) {
+        uni.showLoading({
+          mask: true,
+          title: '加载中',
+        })
         reqFetchData('api', 'workOrder', queryParams.id).then(res => {
+          uni.hideLoading();
           if (res.status == 200) {
+            // 检查科室处理
+            if (res.data.middleDept) {
+              //有检查科室的话
+              res.data.middleDept = res.data.middleDept.map(v => {
+                return this.deptDisplay == 2 ? v.deptalias : v.dept;
+              }).toString();
+            }
+            // 终点科室处理
+            res.data.endDepts = res.data.endDepts.map(v => {
+              return this.deptDisplay == 2 ? v.deptalias : v.dept;
+            }).toString();
+            // 工单信息
             this.orderInfo = res.data;
+            //底部按钮处理
+            let btns = [{
+              name: "回到列表",
+              type: "default",
+              click: () => {
+                uni.navigateTo({
+                  url: "/pages/orderList/orderList",
+                });
+              },
+            }];
+            let newOrder = this.orderInfo;
+            if (newOrder.gdState.value == GDSTATE['待抢单'] ||
+              newOrder.gdState.value == GDSTATE['待接单'] ||
+              newOrder.gdState.value == GDSTATE['待到达'] ||
+              newOrder.gdState.value == GDSTATE['定时预约'] ||
+              newOrder.gdState.value == GDSTATE['待评价']) {
+
+              if (newOrder.gdState.value == GDSTATE['待评价']) {
+                //评价按钮
+                btns.push({
+                  name: "评价",
+                  type: "primary",
+                  click: () => {
+                    showAppraise.call(this, newOrder.id, () => {
+                      this.$refs.seiminModel.close();
+                      uni.navigateTo({
+                        url: "/pages/orderList/orderList",
+                      });
+                    });
+                  },
+                })
+              }
+
+              if (newOrder.gdState.value == GDSTATE['待抢单'] ||
+                newOrder.gdState.value == GDSTATE['待接单'] ||
+                newOrder.gdState.value == GDSTATE['待到达'] ||
+                newOrder.gdState.value == GDSTATE['定时预约']) {
+                //撤销按钮
+                btns.push({
+                  name: "撤销",
+                  type: "primary",
+                  click: () => {
+                    openRecallModal.call(this, newOrder.id, () => {
+                      this.$refs.seiminModel.close();
+                      uni.navigateTo({
+                        url: "/pages/orderList/orderList",
+                      });
+                    });
+                  },
+                })
+              }
+
+              if (newOrder.gdState.value == GDSTATE['定时预约']) {
+                //立即执行按钮
+                btns.push({
+                  name: "立即执行",
+                  type: "primary",
+                  click: () => {
+                    openExecModal.call(this, newOrder.id, () => {
+                      this.$refs.seiminModel.close();
+                      uni.navigateTo({
+                        url: "/pages/orderList/orderList",
+                      });
+                    });
+                  },
+                })
+              }
+
+              if ((newOrder.gdState.value == GDSTATE['待抢单'] ||
+                  newOrder.gdState.value == GDSTATE['待到达']) &&
+                newOrder.taskType.allowUrgent == 1 &&
+                !newOrder.urgentDetails) {
+                //加急按钮
+                btns.push({
+                  name: "加急",
+                  type: "primary",
+                  click: () => {
+                    showJiaji.call(this, newOrder.id, () => {
+                      this.$refs.seiminModel.close();
+                      uni.navigateTo({
+                        url: "/pages/orderList/orderList",
+                      });
+                    });
+                  },
+                })
+              }
+            }
+            // 按钮赋值
+            this.btns = btns;
           } else {
+            this.btns = [{
+              name: "回到列表",
+              type: "default",
+              click: () => {
+                uni.navigateTo({
+                  url: "/pages/orderList/orderList",
+                });
+              },
+            }, ];
             this.$refs.seiminModel.show({
               skin: 'toast',
               icon: 'error',
@@ -56,17 +319,132 @@
   .orderDetail {
     padding-bottom: 108rpx;
 
+    // 头部
     .orderDetail_header {
+      position: fixed;
+      z-index: 98;
+      width: 100%;
       height: 88rpx;
+      background-color: #fff;
+      color: #333;
       @include flex;
 
       .orderDetail_header_item {
         flex: 1;
+        font-size: 32rpx;
         @include border(right);
+        @include border(bottom);
         @include flex(center, center);
 
+        &:last-of-type {
+          border-right: none;
+        }
+
         &.active {
           color: $defaultColor;
+          border-bottom: 4rpx solid $defaultColor;
+        }
+      }
+    }
+
+    // tab
+    // 工单信息
+    .orderDetail_info {
+      padding: 108rpx 24rpx 0;
+
+      .orderDetail_infoItem {
+        width: 702rpx;
+        min-height: 320rpx;
+        background-color: #fff;
+        margin-top: 8rpx;
+        border-radius: 8rpx;
+        position: relative;
+        padding: 0 24rpx;
+        font-size: 32rpx;
+        @include border;
+        @include semicircle(#f9fafb, 82rpx);
+        @include flex(flex-start, stretch, column);
+
+        .ji,
+        .jiaji {
+          width: 60rpx;
+          position: absolute;
+          right: 0;
+          top: 0;
+        }
+
+        .orderDetail_infoItem_header {
+          height: 86rpx;
+          @include border($directive:bottom, $style:dashed);
+          @include flex(space-between, center);
+
+          .orderDetail_infoItem_header_title {
+            color: #333;
+            flex: 1;
+            @include flex(flex-start, center);
+
+            .icon {
+              width: 10rpx;
+              height: 46rpx;
+              border-radius: 2rpx;
+              background-color: #F0F6ED;
+              @include btn_background;
+            }
+
+            .taskNameAndWorkerName {
+              flex: 1;
+              @include flex;
+
+              .taskName {
+                max-width: 10em;
+                margin-left: 8rpx;
+                font-size: 38rpx;
+                font-weight: bold;
+                @include clamp;
+              }
+            }
+          }
+
+          .orderDetail_infoItem_header_more {
+            color: #333;
+            font-weight: bold;
+            font-size: 38rpx;
+            @include clamp;
+          }
+        }
+
+        .orderDetail_infoItem_item {
+          padding-top: 12rpx;
+          padding-bottom: 12rpx;
+          color: #333;
+          font-size: 30rpx;
+          flex: 1;
+          @include border(bottom);
+          @include flex(flex-start, stretch, column);
+
+          &:last-of-type {
+            border-bottom: none;
+          }
+
+          .orderDetail_infoItem_item_content {
+            margin-top: 20rpx;
+            @include flex(space-between, stretch);
+
+            .orderDetail_infoItem_item_name {
+              font-size: 34rpx;
+              color: #666;
+              max-width: 4em;
+            }
+
+            .orderDetail_infoItem_item_value {
+              font-size: 38rpx;
+              color: #333;
+              font-weight: bold;
+              max-width: 420rpx;
+              text-align: justify;
+              word-break: break-all;
+            }
+          }
         }
       }
     }

pages/orderList/orderList.vue

@@ -62,21 +62,21 @@
           newOrder.gdState.value == GDSTATE['待评价']
           ">
             <button type="primary" class="btn" v-if="newOrder.gdState.value == GDSTATE['待评价']"
-              @click="showAppraise(newOrder.id)">评价</button>
+              @click.stop="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>
+            " @click.stop="openRecallModal(newOrder.id)">撤销</button>
             <button type="primary" class="btn" v-if="newOrder.gdState.value == GDSTATE['定时预约']"
-              @click="openExecModal(newOrder.id)">立即执行</button>
+              @click.stop="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>
+            " @click.stop="showJiaji(newOrder.id)">加急</button>
           </view>
         </view>
       </view>
@@ -97,10 +97,6 @@
   } from "vuex";
   import {
     reqFetchDataList,
-    reqDelWorkOrder,
-    reqUrge,
-    reqDirectStartOrder,
-    reqEvaluate,
   } from "../../request/api.js";
   import {
     GDSTATE
@@ -108,6 +104,12 @@
   import {
     WORKORDEREVALUATION
   } from "../../utils/enum.workorderEvaluation.js";
+  import {
+    showAppraise,
+    openRecallModal,
+    openExecModal,
+    showJiaji,
+  } from "../../utils/index.js";
   export default {
     name: 'orderList',
     data() {
@@ -159,213 +161,30 @@
       },
       //评价
       showAppraise(id) {
-        this.$refs.seiminModel.show({
-          skin: 'evaluate',
-          content: "工单已完成，请对本次服务做出评价！",
-          btns: [{
-              click: () => {
-                console.log('取消');
-                this.$refs.seiminModel.close();
-              }
-            },
-            {
-              click: () => {
-                console.log('确定');
-                let serviceEvaluationId;
-                this.$refs.seiminModel.close();
-                uni.showLoading({
-                  title: '加载中',
-                  mask: true,
-                })
-                //算出评级
-                switch (this.$refs.seiminModel.stars.indexOf('pda-haoping1')) {
-                  case -1:
-                    //五星
-                    serviceEvaluationId = WORKORDEREVALUATION['非常好评'];
-                    break;
-                  case 1:
-                    //一星
-                    serviceEvaluationId = WORKORDEREVALUATION['极差'];
-                    break;
-                  case 2:
-                    //二星
-                    serviceEvaluationId = WORKORDEREVALUATION['差'];
-                    break;
-                  case 3:
-                    //三星
-                    serviceEvaluationId = WORKORDEREVALUATION['一般'];
-                    break;
-                  case 4:
-                    //四星
-                    serviceEvaluationId = WORKORDEREVALUATION['好评'];
-                    break;
-                }
-                let postData = {
-                  serviceEvaluation: {
-                    id: serviceEvaluationId
-                  },
-                  remark: this.$refs.seiminModel.evaluateTextArea,
-                };
-                reqEvaluate(id, 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: '评价失败',
-                    })
-                  }
-                })
-              }
-            }
-          ]
+        showAppraise.call(this, id, () => {
+          this.$refs.seiminModel.close();
+          this.init();
         });
       },
       //撤销
       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: '撤销失败',
-                    })
-                  }
-                })
-              }
-            }
-          ]
+        openRecallModal.call(this, id, () => {
+          this.$refs.seiminModel.close();
+          this.init();
         });
       },
       //立即执行
       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: '加急失败',
-                  })
-                }
-              })
-            }
-          }, ]
-        })
+        openExecModal.call(this, id, () => {
+          this.$refs.seiminModel.close();
+          this.init();
+        });
       },
       //加急
       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() === '') {
-                  uni.showToast({
-                    icon: 'none',
-                    title: '请填写加急原因',
-                  })
-                  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: '加急失败',
-                    })
-                  }
-                })
-              }
-            }
-          ]
+        showJiaji.call(this, id, () => {
+          this.$refs.seiminModel.close();
+          this.init();
         });
       },
       //关闭
@@ -633,7 +452,7 @@
 
         .orderList_listItem_header {
           height: 86rpx;
-          @include border(bottom);
+          @include border($directive:bottom, $style:dashed);
           @include flex(space-between, center);
 
           .orderList_listItem_header_title {
@@ -671,6 +490,7 @@
 
           .orderList_listItem_header_more {
             color: #666;
+            @include clamp;
           }
         }
 

utils/index.js

@@ -4,6 +4,16 @@ import {
   pad,
   enc
 } from "crypto-js";
+import {
+  WORKORDEREVALUATION
+} from "./enum.workorderEvaluation.js";
+import {
+  reqDelWorkOrder,
+  reqUrge,
+  reqEvaluate,
+  reqDirectStartOrder,
+} from "../request/api.js";
+
 //aes加密
 export function encryptByEnAES(data = '') {
   let Key = "dsadmin";
@@ -38,3 +48,234 @@ export function getCurrentPagesSeimin(num = 0) {
   let curRoute = routes[routes.length - 1 - num].route // 获取当前页面路由，也就是最后一个打开的页面路由
   return curRoute;
 };
+
+//评价
+export function showAppraise(id, callBack) {
+  this.$refs.seiminModel.show({
+    skin: 'evaluate',
+    content: "工单已完成，请对本次服务做出评价！",
+    btns: [{
+        click: () => {
+          console.log('取消');
+          this.$refs.seiminModel.close();
+        }
+      },
+      {
+        click: () => {
+          console.log('确定');
+          let serviceEvaluationId;
+          this.$refs.seiminModel.close();
+          uni.showLoading({
+            title: '加载中',
+            mask: true,
+          })
+          //算出评级
+          switch (this.$refs.seiminModel.stars.indexOf('pda-haoping1')) {
+            case -1:
+              //五星
+              serviceEvaluationId = WORKORDEREVALUATION['非常好评'];
+              break;
+            case 1:
+              //一星
+              serviceEvaluationId = WORKORDEREVALUATION['极差'];
+              break;
+            case 2:
+              //二星
+              serviceEvaluationId = WORKORDEREVALUATION['差'];
+              break;
+            case 3:
+              //三星
+              serviceEvaluationId = WORKORDEREVALUATION['一般'];
+              break;
+            case 4:
+              //四星
+              serviceEvaluationId = WORKORDEREVALUATION['好评'];
+              break;
+          }
+          let postData = {
+            serviceEvaluation: {
+              id: serviceEvaluationId
+            },
+            remark: this.$refs.seiminModel.evaluateTextArea,
+          };
+          reqEvaluate(id, postData).then(res => {
+            uni.hideLoading();
+            if (res.status == 200) {
+              this.$refs.seiminModel.show({
+                skin: 'toast',
+                icon: 'success',
+                content: '评价成功',
+                btns: [{
+                  click: () => {
+                    callBack && callBack();
+                  }
+                }]
+              })
+            } else {
+              this.$refs.seiminModel.show({
+                skin: 'toast',
+                icon: 'error',
+                content: '评价失败',
+              })
+            }
+          })
+        }
+      }
+    ]
+  });
+};
+
+//撤销
+export function openRecallModal(id, callBack) {
+  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: '撤销成功',
+                btns: [{
+                  click: () => {
+                    callBack && callBack();
+                  }
+                }]
+              })
+            } else {
+              this.$refs.seiminModel.show({
+                skin: 'toast',
+                icon: 'error',
+                content: '撤销失败',
+              })
+            }
+          })
+        }
+      }
+    ]
+  });
+};
+
+//立即执行
+export function openExecModal(id, callBack) {
+  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: '立即执行成功',
+              btns: [{
+                click: () => {
+                  callBack && callBack();
+                }
+              }]
+            })
+          } else {
+            this.$refs.seiminModel.show({
+              skin: 'toast',
+              icon: 'error',
+              content: '立即执行失败',
+            })
+          }
+        })
+      }
+    }, ]
+  })
+};
+
+//加急
+export function showJiaji(id, callBack) {
+  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() === '') {
+            uni.showToast({
+              icon: 'none',
+              title: '请填写加急原因',
+            })
+            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: '您的加急申请已成功，调度人员会紧急处理！',
+                btns: [{
+                  click: () => {
+                    callBack && callBack();
+                  }
+                }]
+              })
+            } else {
+              this.$refs.seiminModel.show({
+                skin: 'toast',
+                icon: 'error',
+                content: '加急失败',
+              })
+            }
+          })
+        }
+      }
+    ]
+  });
+};