患者建单-未完

components/seiminFooterNav/seiminFooterNav.vue

@@ -124,7 +124,7 @@
         background: linear-gradient(180deg, #74c271 0%, #39b199 100%);
         border-radius: 50%;
         position: relative;
-        top: -10rpx;
+        top: -16rpx;
         color: #fff;
       }
 

pages.json

@@ -2,12 +2,18 @@
   "pages": [{
       "path": "pages/login/login",
       "style": {
+        "h5": {
+          "titleNView": false
+        },
         "navigationBarTitleText": "登录"
       }
     },
     {
       "path": "pages/index/index",
       "style": {
+        "h5": {
+          "titleNView": false
+        },
         "navigationBarTitleText": "首页",
         "navigationBarBackgroundColor": "#49B856",
         "enablePullDownRefresh": true
@@ -15,6 +21,9 @@
     }, {
       "path": "pages/quickCreateOrder/quickCreateOrder",
       "style": {
+        "h5": {
+          "titleNView": false
+        },
         "navigationBarTitleText": "快捷建单",
         "navigationBarBackgroundColor": "#2C2D31"
       }
@@ -22,6 +31,9 @@
     }, {
       "path": "pages/searchDept/searchDept",
       "style": {
+        "h5": {
+          "titleNView": false
+        },
         "navigationBarTitleText": "选择科室",
         "navigationBarBackgroundColor": "#2C2D31"
       }
@@ -29,6 +41,9 @@
     }, {
       "path": "pages/orderList/orderList",
       "style": {
+        "h5": {
+          "titleNView": false
+        },
         "navigationBarTitleText": "工单列表",
         "navigationBarBackgroundColor": "#2C2D31",
         "enablePullDownRefresh": true
@@ -36,6 +51,9 @@
     }, {
       "path": "pages/orderDetail/orderDetail",
       "style": {
+        "h5": {
+          "titleNView": false
+        },
         "navigationBarTitleText": "工单详情",
         "navigationBarBackgroundColor": "#2C2D31"
       }
@@ -43,6 +61,9 @@
     }, {
       "path": "pages/detail/detail",
       "style": {
+        "h5": {
+          "titleNView": false
+        },
         "navigationBarTitleText": "详情",
         "navigationBarBackgroundColor": "#2C2D31"
       }
@@ -50,6 +71,9 @@
     }, {
       "path": "pages/patientList/patientList",
       "style": {
+        "h5": {
+          "titleNView": false
+        },
         "navigationBarTitleText": "患者列表",
         "navigationBarBackgroundColor": "#2C2D31"
       }
@@ -57,10 +81,33 @@
     }, {
       "path": "pages/patientDetail/patientDetail",
       "style": {
+        "h5": {
+          "titleNView": false
+        },
         "navigationBarTitleText": "患者详情",
         "navigationBarBackgroundColor": "#2C2D31"
       }
 
+    }, {
+      "path": "pages/patientBuild/patientBuild",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "navigationBarTitleText": "建单",
+        "navigationBarBackgroundColor": "#2C2D31"
+      }
+
+    }, {
+      "path": "pages/appointmentInspect/appointmentInspect",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "navigationBarTitleText": "预约检查",
+        "navigationBarBackgroundColor": "#2C2D31"
+      }
+
     }
   ],
   "globalStyle": {

pages/appointmentInspect/appointmentInspect.vue

@@ -0,0 +1,248 @@
+<template>
+  <view class="appointmentInspect">
+    <view class="qco_msg" v-html="patientMsg"></view>
+    <view class="select_block_wrap">
+      <view class="uni-list">
+        <checkbox-group @change="checkboxChange">
+          <scroll-view scroll-y class="scrollHeight">
+            <label class="inspect_listItem" v-for="inspect in inspects" :key="inspect.value">
+              <view class="inspect_listItem_header">
+                <view class="inspect_listItem_header_title">
+                  <checkbox color="#09BB07" :value="inspect.value" :checked="inspect.checked" />
+                  <view class="inspectInfo">
+                    <text class="info">
+                      <text v-if="inspect.yyTime">{{inspect.yyTime|formatDate('MM-dd HH:mm')}}</text>
+                      <text class="dept" v-if="inspect.execDept">
+                        {{deptDisplay == 2?inspect.execDept.deptalias:inspect.execDept.dept}}
+                      </text>
+                    </text>
+                  </view>
+                </view>
+              </view>
+              <view class="inspect_listItem_item">
+                <view class="inspect_listItem_item_content">
+                  <text class="inspect_listItem_item_name">进行 {{inspect.inspectName || "检查"}}</text>
+                </view>
+              </view>
+            </label>
+          </scroll-view>
+        </checkbox-group>
+      </view>
+    </view>
+    <!-- 底部 -->
+    <seiminFooterBtn :btns="btns"></seiminFooterBtn>
+    <seiminModel ref="seiminModel"></seiminModel>
+  </view>
+</template>
+
+<script>
+  import cloneDeep from 'lodash/cloneDeep';
+  import {
+    mapState
+  } from "vuex";
+  import {
+    ASSOCIATION_TYPES
+  } from "../../utils/enum.association_types.js";
+  export default {
+    data() {
+      return {
+        ASSOCIATION_TYPES,
+        // 检查列表
+        inspects: [],
+        // 是否加急
+        isUrgent: false,
+        // 设备
+        goods: [],
+        //患者建单信息展示
+        patientMsg: '',
+        // 传递过来的参数
+        queryParams: {},
+        //底部按钮
+        btns: [{
+          name: "上一步",
+          type: "primary",
+          click: () => {
+            uni.navigateBack();
+          },
+        }, {
+          name: "下一步",
+          type: "primary",
+          click: () => {
+            uni.navigateTo({
+              url: '/pages/patientBuild/patientBuild'
+            })
+          },
+        }, ],
+      };
+    },
+    computed: {
+      ...mapState('login', ['loginInfo']),
+      ...mapState('other', [
+        "deptDisplay",
+        'patientBuildTrip',
+        'selectedPatient'
+      ]),
+    },
+    methods: {
+      // 切换是否加急
+      switchChange(e) {
+        this.isUrgent = e.detail.value;
+        this.urgentRemark = '';
+      },
+      // 选择检查
+      checkboxChange: function(e) {
+        console.log(e, this.inspects);
+        var inspects = this.inspects,
+          values = e.detail.value;
+        for (var i = 0, lenI = inspects.length; i < lenI; ++i) {
+          const item = inspects[i]
+          if (values.includes(item.value)) {
+            this.$set(item, 'checked', true)
+          } else {
+            this.$set(item, 'checked', false)
+          }
+        }
+      },
+      // 立即建单
+      buildOrder() {
+        console.log(this.urgentRemark)
+        console.log(this.isUrgent)
+        console.log(this.goods)
+        // 加急原因非空
+        if (this.isUrgent && !this.urgentRemark) {
+          this.$refs.seiminModel.show({
+            skin: 'toast',
+            icon: 'warn',
+            content: '请填写加急原因',
+          })
+          return;
+        }
+      }
+    },
+    onLoad(queryParams) {
+      this.patientMsg = `以下是患者<b class="green">${this.selectedPatient.patientName}</b>当天预约的检查，请选择本次服务的检查项`;
+      let inspects = this.patientBuildTrip.data || [];
+      inspects.map(v => {
+        v.label = v.inspectName;
+        v.value = v.id.toString();
+      });
+      this.inspects = inspects
+      this.queryParams = queryParams;
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .appointmentInspect {
+    padding-bottom: 108rpx;
+
+    ::v-deep uni-checkbox .uni-checkbox-input {
+      width: 40rpx;
+      height: 40rpx;
+    }
+
+    ::v-deep .uni-checkbox-input-checked {
+      background-color: #09BB07;
+
+      &:before {
+        color: #fff;
+      }
+    }
+
+    ::v-deep uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
+      border-color: #09BB07;
+    }
+
+    .qco_msg {
+      background-color: #f9fafb;
+      position: fixed;
+      width: 100%;
+      z-index: 99;
+      height: 144rpx;
+      padding: 32rpx;
+      color: #999;
+      line-height: 40rpx;
+      font-size: 28rpx;
+      text-align: center;
+    }
+
+    .select_block_wrap {
+      padding: 144rpx 24rpx 0;
+
+      .scrollHeight {
+        height: 100%;
+      }
+
+      .inspect_listItem {
+        width: 702rpx;
+        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);
+
+        .inspect_listItem_header {
+          height: 86rpx;
+          @include border($directive:bottom, $style:dashed);
+          @include flex(space-between, center);
+
+          .inspect_listItem_header_title {
+            color: #333;
+            flex: 1;
+            @include flex(flex-start, center);
+
+            .inspectInfo {
+              flex: 1;
+              @include flex;
+
+              .info {
+                color: #333;
+                font-size: 36rpx;
+                font-weight: bold;
+                @include clamp;
+
+                .dept {
+                  margin-left: 8rpx;
+                }
+              }
+
+              .workerName {
+                flex: 1;
+                @include clamp;
+              }
+            }
+          }
+        }
+
+        .inspect_listItem_item {
+          height: 88rpx;
+          color: #333;
+          font-size: 30rpx;
+          flex: 1;
+          @include border(bottom);
+          @include flex(flex-start, stretch, column);
+
+          &:last-of-type {
+            border-bottom: none;
+          }
+
+          .inspect_listItem_item_content {
+            flex: 1;
+            @include flex(space-between, center);
+
+            .inspect_listItem_item_name {
+              color: #333;
+              font-size: 36rpx;
+              text-indent: 1.5em;
+              @include clamp;
+            }
+          }
+        }
+      }
+    }
+  }
+</style>

pages/index/index.vue

@@ -505,7 +505,7 @@
 
     // 弧形背景
     .arc_edge {
-      @include arc_edge;
+      @include arc_edge(220rpx);
     }
 
     .index_container {

pages/orderList/orderList.vue

@@ -102,7 +102,7 @@
     GDSTATE
   } from "../../utils/enum.gdstate.js";
   import {
-    WORKORDEREVALUATION
+    WORKORDER_EVALUATION
   } from "../../utils/enum.workorderEvaluation.js";
   import {
     showAppraise,

pages/patientBuild/patientBuild.vue

@@ -0,0 +1,260 @@
+<template>
+  <view class="patientBuild">
+    <view class="qco_msg" v-html="patientMsg"></view>
+    <view class="select_block_wrap">
+      <view class="uni-list">
+        <checkbox-group @change="checkboxChange">
+          <label class="select_block" v-for="good in goods" :key="good.value">
+            <checkbox color="#09BB07" :value="good.value" :checked="good.checked" />
+            <view>{{good.name}}</view>
+          </label>
+        </checkbox-group>
+      </view>
+    </view>
+    <!-- 加急 -->
+    <view class="remarks" v-if="patientTaskType.allowUrgent == 1">
+      <view class="remarks_nav">
+        是否加急
+      </view>
+      <view class="remarks_btn">
+        <text class="remarks_btn_name">加急</text>
+        <switch class="remarks_btn_value" color="#09BB07" @change="switchChange" />
+      </view>
+      <textarea v-if="isUrgent" class="remarks_textarea" auto-height :maxlength="100" placeholder-style="color:#999;"
+        placeholder="请填写加急原因" v-model.trim="urgentRemark" />
+      <view class="remarks_tips"
+        v-if="(patientTaskType.associationType.value === ASSOCIATION_TYPES['患者其他服务业务'] && patientTaskType.appointmentOtherSwitch == 1) ||(patientTaskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务'] && patientTaskType.appointmentSwitch == 1)">
+        <view class="tips">系统支持提前预约送检服务，您是否需要！</view>
+        <view class="tips">我不需要预约，希望送检人员立即上门，点击立即建单；</view>
+        <view class="tips">我需要提前预约送检服务，点击预约建单；</view>
+      </view>
+    </view>
+    <!-- 底部 -->
+    <seiminFooterBtn :btns="btns"></seiminFooterBtn>
+    <seiminModel ref="seiminModel"></seiminModel>
+  </view>
+</template>
+
+<script>
+  import cloneDeep from 'lodash/cloneDeep';
+  import {
+    mapState,
+  } from "vuex";
+  import {
+    ASSOCIATION_TYPES
+  } from "../../utils/enum.association_types.js";
+  export default {
+    data() {
+      return {
+        ASSOCIATION_TYPES,
+        // 是否加急
+        isUrgent: false,
+        // 设备
+        goods: [],
+        //患者建单信息展示
+        patientMsg: '',
+        // 传递过来的参数
+        queryParams: {},
+        // 加急原因
+        urgentRemark: "",
+        //底部按钮
+        btns: [],
+      };
+    },
+    computed: {
+      ...mapState('other', [
+        'patientBuildTrip',
+        'patientTaskType',
+        'selectedPatient'
+      ]),
+    },
+    methods: {
+      // 切换是否加急
+      switchChange(e) {
+        this.isUrgent = e.detail.value;
+        this.urgentRemark = '';
+      },
+      // 选择设备
+      checkboxChange: function(e) {
+        console.log(e, this.goods);
+        var goods = this.goods,
+          values = e.detail.value;
+        for (var i = 0, lenI = goods.length; i < lenI; ++i) {
+          const item = goods[i]
+          if (values.includes(item.value)) {
+            this.$set(item, 'checked', true)
+          } else {
+            this.$set(item, 'checked', false)
+          }
+        }
+      },
+      // 立即建单
+      buildOrder() {
+        console.log(this.urgentRemark)
+        console.log(this.isUrgent)
+        console.log(this.goods)
+        // 加急原因非空
+        if (this.isUrgent && !this.urgentRemark) {
+          this.$refs.seiminModel.show({
+            skin: 'toast',
+            icon: 'warn',
+            content: '请填写加急原因',
+          })
+          return;
+        }
+      }
+    },
+    onLoad(queryParams) {
+      this.patientMsg = `患者<b class="green">${this.selectedPatient.patientName}</b>即将出科，请您选择送检人员需携带哪些设备！`;
+      let goods = this.patientBuildTrip.goods || [];
+      this.goods = goods;
+      this.queryParams = queryParams;
+      if (
+        (this.patientTaskType.associationType.value === ASSOCIATION_TYPES['患者其他服务业务'] && this.patientTaskType
+          .appointmentOtherSwitch == 1) ||
+        (this.patientTaskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务'] && this.patientTaskType
+          .appointmentSwitch == 1)
+      ) {
+        //患者陪检业务或患者其他服务业务，并且预约建单开关打开的情况下
+        this.btns = [{
+          name: "上一步",
+          type: "primary",
+          click: () => {
+            uni.navigateBack();
+          },
+        }, {
+          name: "预约建单",
+          type: "primary",
+          click: () => {
+            alert('预约建单');
+          },
+        }, {
+          name: "立即建单",
+          type: "primary",
+          click: () => {
+            this.buildOrder();
+          },
+        }, ];
+      } else {
+        this.btns = [{
+          name: "上一步",
+          type: "primary",
+          click: () => {
+            uni.navigateBack();
+          },
+        }, {
+          name: "立即建单",
+          type: "primary",
+          click: () => {
+            this.buildOrder();
+          },
+        }, ];
+      }
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .patientBuild {
+    margin-bottom: 100rpx;
+
+    ::v-deep .uni-checkbox-input {
+      border-radius: 50%;
+    }
+
+    ::v-deep .uni-checkbox-input-checked {
+      background-color: #09BB07;
+
+      &:before {
+        color: #fff;
+      }
+    }
+
+    ::v-deep uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
+      border-color: #09BB07;
+    }
+
+    .qco_msg {
+      min-height: 144rpx;
+      padding: 32rpx;
+      color: #999;
+      line-height: 40rpx;
+      font-size: 28rpx;
+      text-align: center;
+    }
+
+    .select_block_wrap {
+      @include border(top);
+
+      // 设备
+      .select_block {
+        padding: 0 30rpx;
+        height: 88rpx;
+        font-size: 34rpx;
+        background-color: #fff;
+        position: relative;
+        @include flex(flex-start, center);
+
+        &:last-of-type {
+          &::after {
+            opacity: 0;
+          }
+        }
+
+        &::after {
+          content: '';
+          height: 1px;
+          width: calc(100vw - 30rpx);
+          background-color: #E5E5E5;
+          position: absolute;
+          right: 0;
+          bottom: 0;
+        }
+
+        .select_label {
+          color: #000;
+        }
+      }
+    }
+
+    // 备注
+    .remarks {
+      min-height: 150rpx;
+      background-color: #f9fafb;
+      @include border(top);
+
+      .remarks_nav {
+        padding: 0 25rpx;
+        height: 66rpx;
+        font-size: 28rpx;
+        color: #666;
+        @include flex(flex-start, center);
+        @include border(bottom);
+      }
+
+      .remarks_btn {
+        padding: 0 25rpx;
+        font-size: 34rpx;
+        height: 88rpx;
+        background-color: #fff;
+        @include border(bottom);
+        @include flex(space-between, center);
+      }
+
+      .remarks_textarea {
+        padding: 22rpx 25rpx;
+        width: 100%;
+        min-height: 150rpx;
+        background-color: #fff;
+        @include border(bottom);
+      }
+
+      .remarks_tips {
+        padding: 32rpx 25rpx;
+        color: #999;
+        font-size: 28rpx;
+        line-height: 40rpx;
+      }
+    }
+  }
+</style>

pages/patientList/patientList.vue

@@ -58,11 +58,16 @@
     mapState,
     mapMutations,
   } from "vuex";
+  import {
+    ASSOCIATION_TYPES
+  } from '../../utils/enum.association_types.js';
   export default {
     data() {
       return {
+        ASSOCIATION_TYPES,
         checkedShowMsg: {}, //当前选中的任务类型的buildtrip信息
         selectedPatient: {}, //当前选中的患者
+        taskTypeListResource: [], //任务类型列表(请求的原始数据)
         taskTypeList: [], //任务类型列表
         pickerTitle: "", //一键建单picker的title
         debounceInp: null,
@@ -100,53 +105,68 @@
         })
         reqBuildTrip(postData).then(res => {
           uni.hideLoading();
-          let taskType = this.taskTypeList.find(v => v.value == checkedObj.value);
-          let patientTaskTypeName = taskType ? taskType.label : '';
-          if (res.status == 100015) {
-            this.checkedShowMsg = res.data;
-            //需要选择起点科室和目标科室
-            uni.navigateTo({
-              url: "/pages/quickCreateOrder/quickCreateOrder",
-            });
-            this.changeQucikCreateOrderType({
-              type: "patient",
-              taskTypeId: checkedObj.value,
-              patientTaskTypeName,
-              patientBuildTrip: res,
-            });
-          } else if (res.status == 100013) {
-            this.checkedShowMsg = res.data;
-            //需要选择起点科室
-            uni.navigateTo({
-              url: "/pages/quickCreateOrder/quickCreateOrder",
-            });
-            this.changeQucikCreateOrderType({
-              type: "patient",
-              taskTypeId: checkedObj.value,
-              patientTaskTypeName,
-              patientBuildTrip: res,
-            });
-          } else if (res.status == 100014) {
-            this.checkedShowMsg = res.data;
-            //需要选择目标科室
-            uni.navigateTo({
-              url: "/pages/quickCreateOrder/quickCreateOrder",
-            });
-            this.changeQucikCreateOrderType({
-              type: "patient",
-              taskTypeId: checkedObj.value,
-              patientTaskTypeName,
-              patientBuildTrip: res,
-            });
-          } else {
-            //无需选择科室
-            this.checkedShowMsg = res.data;
-            this.changeQucikCreateOrderType({
-              type: "patient",
-              taskTypeId: checkedObj.value,
-              patientTaskTypeName,
-              patientBuildTrip: res,
-            });
+          let taskType = this.taskTypeListResource.find(v => v.id == checkedObj.value);
+          let patientTaskType = taskType || {};
+          if (patientTaskType.associationType.value == this.ASSOCIATION_TYPES['患者其他服务业务']) {
+            // 患者其他服务业务--无法用status判断，运输过程“默认患者所在科室”没有返回status==200，估计是后端漏掉了这种情况，如果后期后端可以返回status，则可以根据status判断。
+            if (res.start && res.end) {
+              if (res.status == 100013 || res.status == 100014 || res.status == 100015) {
+                this.checkedShowMsg = res.data;
+                //需要选择起点科室和目标科室
+                this.changeQucikCreateOrderType({
+                  type: "patient",
+                  taskTypeId: checkedObj.value,
+                  patientTaskType,
+                  selectedPatient: this.selectedPatient,
+                  patientBuildTrip: res,
+                });
+                uni.navigateTo({
+                  url: "/pages/quickCreateOrder/quickCreateOrder",
+                });
+              } else {
+                //无需选择科室
+                this.checkedShowMsg = res.data;
+                this.changeQucikCreateOrderType({
+                  type: "patient",
+                  taskTypeId: checkedObj.value,
+                  patientTaskType,
+                  selectedPatient: this.selectedPatient,
+                  patientBuildTrip: res,
+                });
+                uni.navigateTo({
+                  url: "/pages/patientBuild/patientBuild",
+                });
+              }
+            } else {
+              this.$refs.seiminModel.show({
+                skin: "toast",
+                icon: "error",
+                content: res.msg || "获取数据失败",
+              });
+              throw new Error(res.msg || '获取数据失败');
+            }
+          } else if (patientTaskType.associationType.value == this.ASSOCIATION_TYPES['患者陪检业务']) {
+            // 患者陪检业务
+            if (res.status == 200) {
+              this.checkedShowMsg = res.data;
+              this.changeQucikCreateOrderType({
+                type: "patient",
+                taskTypeId: checkedObj.value,
+                patientTaskType,
+                selectedPatient: this.selectedPatient,
+                patientBuildTrip: res,
+              });
+              uni.navigateTo({
+                url: "/pages/appointmentInspect/appointmentInspect",
+              });
+            } else {
+              this.$refs.seiminModel.show({
+                skin: "toast",
+                icon: "error",
+                content: res.msg || "获取数据失败",
+              });
+              throw new Error(res.msg || '获取数据失败');
+            }
           }
         })
       },
@@ -162,6 +182,7 @@
           uni.hideLoading();
           if (res.status == 200) {
             res.data = res.data || [];
+            this.taskTypeListResource = res.data;
             this.taskTypeList = res.data.map((v) => ({
               value: v.id,
               label: v.taskName,

pages/quickCreateOrder/quickCreateOrder.vue

@@ -5,19 +5,13 @@
     <!-- 起点科室,终点科室 -->
     <block
       v-if="(qucikCreateOrderType === 'other' || qucikCreateOrderType === 'patient') && (dataObj.start || dataObj.end)">
-      <!-- 返回值的departmentStrategy是201 则是默认发起科室 -->
-      <!-- 返回值的departmentStrategy是202 则是固定科室范围 -->
-      <!-- 返回值的departmentStrategy是203 则是固定科室 -->
-      <!-- 返回值的departmentStrategy是204 则是自主填写 -->
-      <!-- 返回值的departmentStrategy是205 则是固定科室类型 -->
-      <!-- 100013 （护士端一键建单展示策略）取起点科室，和msg值展示 -->
       <view class="select_block" @click="selectDept('start')"
-        v-if="qucikCreateOrderType !== 'patient'||(qucikCreateOrderType === 'patient'&&!(dataObj.start.start.departmentStrategy == 201 || dataObj.start.start.departmentStrategy == 203))">
+        v-if="qucikCreateOrderType !== 'patient'||(qucikCreateOrderType === 'patient'&&!(dataObj.start.start.departmentStrategy == DEPARTMENT_STRATEGY['默认发起科室'] || dataObj.start.start.departmentStrategy == DEPARTMENT_STRATEGY['固定科室']))">
         <!-- 默认科室和固定科室 -->
         <text class="select_label"
-          :class="{disableColor:dataObj.start.start.departmentStrategy == 201 || dataObj.start.start.departmentStrategy == 203}">起点科室</text>
+          :class="{disableColor:dataObj.start.start.departmentStrategy == DEPARTMENT_STRATEGY['默认发起科室'] || dataObj.start.start.departmentStrategy == DEPARTMENT_STRATEGY['固定科室']}">起点科室</text>
         <view class="select_placeholder"
-          v-if="dataObj.start.start.departmentStrategy == 201 || dataObj.start.start.departmentStrategy == 203">
+          v-if="dataObj.start.start.departmentStrategy == DEPARTMENT_STRATEGY['默认发起科室'] || dataObj.start.start.departmentStrategy == DEPARTMENT_STRATEGY['固定科室']">
           {{deptDisplay == 1? startDept.dept: startDept.deptalias}}
         </view>
         <!-- 固定科室范围,固定科室类型，自主选择 -->
@@ -27,12 +21,12 @@
         </view>
       </view>
       <view class="select_block" @click="selectDept('end')"
-        v-if="qucikCreateOrderType !== 'patient'||(qucikCreateOrderType === 'patient'&&!(dataObj.end.end.departmentStrategy == 201 || dataObj.end.end.departmentStrategy == 203))">
+        v-if="qucikCreateOrderType !== 'patient'||(qucikCreateOrderType === 'patient'&&!(dataObj.end.end.departmentStrategy == DEPARTMENT_STRATEGY['默认发起科室'] || dataObj.end.end.departmentStrategy == DEPARTMENT_STRATEGY['固定科室']))">
         <!-- 默认科室和固定科室 -->
         <text class="select_label"
-          :class="{disableColor:dataObj.end.end.departmentStrategy == 201 || dataObj.end.end.departmentStrategy == 203}">终点科室</text>
+          :class="{disableColor:dataObj.end.end.departmentStrategy == DEPARTMENT_STRATEGY['默认发起科室'] || dataObj.end.end.departmentStrategy == DEPARTMENT_STRATEGY['固定科室']}">终点科室</text>
         <view class="select_placeholder"
-          v-if="dataObj.end.end.departmentStrategy == 201 || dataObj.end.end.departmentStrategy == 203">
+          v-if="dataObj.end.end.departmentStrategy == DEPARTMENT_STRATEGY['默认发起科室'] || dataObj.end.end.departmentStrategy == DEPARTMENT_STRATEGY['固定科室']">
           {{deptDisplay == 1? endDept.dept: endDept.deptalias}}
         </view>
         <!-- 固定科室范围,固定科室类型，自主选择 -->
@@ -92,9 +86,13 @@
   import {
     SOURCEID
   } from "../../utils/enum.sourceid.js";
+  import {
+    DEPARTMENT_STRATEGY
+  } from "../../utils/enum.departmentStrategy.js";
   export default {
     data() {
       return {
+        DEPARTMENT_STRATEGY,
         //患者建单信息展示
         patientMsg: '',
         // 传递过来的参数
@@ -130,7 +128,7 @@
         'searchDeptParams',
         'searchDeptResultList',
         'patientBuildTrip',
-        'patientTaskTypeName'
+        'patientTaskType'
       ]),
       isWriteDept() {
         return {
@@ -160,7 +158,7 @@
               type: "primary",
               click: () => {
                 uni.navigateTo({
-                  url: "/pages/index/index",
+                  url: "/pages/patientBuild/patientBuild",
                 });
               },
             },
@@ -248,15 +246,15 @@
           if (res.start) {
             //其他服务建单
             if (
-              res.start.start.departmentStrategy == 201 ||
-              res.start.start.departmentStrategy == 203) {
+              res.start.start.departmentStrategy == this.DEPARTMENT_STRATEGY['默认发起科室'] ||
+              res.start.start.departmentStrategy == this.DEPARTMENT_STRATEGY['固定科室']) {
               this.startDept = res.start.start.list[0];
             }
 
             if (
-              res.start.start.departmentStrategy == 202 ||
-              res.start.start.departmentStrategy == 204 ||
-              res.start.start.departmentStrategy == 205
+              res.start.start.departmentStrategy == this.DEPARTMENT_STRATEGY['固定科室范围'] ||
+              res.start.start.departmentStrategy == this.DEPARTMENT_STRATEGY['自主填写'] ||
+              res.start.start.departmentStrategy == this.DEPARTMENT_STRATEGY['固定科室类型']
             ) {
               if (this.queryParams.isShow) {
                 this.startDept = this.searchDeptResultList.start || {};
@@ -268,15 +266,15 @@
           if (res.end) {
             //其他服务建单
             if (
-              res.end.end.departmentStrategy == 201 ||
-              res.end.end.departmentStrategy == 203) {
+              res.end.end.departmentStrategy == this.DEPARTMENT_STRATEGY['默认发起科室'] ||
+              res.end.end.departmentStrategy == this.DEPARTMENT_STRATEGY['固定科室']) {
               this.endDept = res.end.end.list[0];
             }
 
             if (
-              res.end.end.departmentStrategy == 202 ||
-              res.end.end.departmentStrategy == 204 ||
-              res.end.end.departmentStrategy == 205
+              res.end.end.departmentStrategy == this.DEPARTMENT_STRATEGY['固定科室范围'] ||
+              res.end.end.departmentStrategy == this.DEPARTMENT_STRATEGY['自主填写'] ||
+              res.end.end.departmentStrategy == this.DEPARTMENT_STRATEGY['固定科室类型']
             ) {
               if (this.queryParams.isShow) {
                 this.endDept = this.searchDeptResultList.end || {};
@@ -428,20 +426,20 @@
       selectDept(type) {
         this.selectdDeptType = type; //存储类型
         if (
-          (this.dataObj.start.start.departmentStrategy == 201 ||
-            this.dataObj.start.start.departmentStrategy == 203) &&
+          (this.dataObj.start.start.departmentStrategy == this.DEPARTMENT_STRATEGY['默认发起科室'] ||
+            this.dataObj.start.start.departmentStrategy == this.DEPARTMENT_STRATEGY['固定科室']) &&
           type === 'start') {
           //默认科室和固定科室不能选科室
           return;
         }
         if (
-          (this.dataObj.end.end.departmentStrategy == 201 ||
-            this.dataObj.end.end.departmentStrategy == 203) &&
+          (this.dataObj.end.end.departmentStrategy == this.DEPARTMENT_STRATEGY['默认发起科室'] ||
+            this.dataObj.end.end.departmentStrategy == this.DEPARTMENT_STRATEGY['固定科室']) &&
           type === 'end') {
           //默认科室和固定科室不能选科室
           return;
         }
-        if (this.dataObj[type][type].departmentStrategy == 202) {
+        if (this.dataObj[type][type].departmentStrategy == this.DEPARTMENT_STRATEGY['固定科室范围']) {
           // 固定科室范围
           this.pickerTitle = type === 'start' ? '请选择起点科室' : '请选择终点科室';
           this.deptList = this.dataObj[type][type].list.map(v => ({
@@ -451,8 +449,8 @@
           }))
           console.log(this.deptList, this.pickerTitle)
           this.openPicker();
-        } else if (this.dataObj[type][type].departmentStrategy == 204 || this.dataObj[type][type].departmentStrategy ==
-          205) {
+        } else if (this.dataObj[type][type].departmentStrategy == this.DEPARTMENT_STRATEGY['自主填写'] || this.dataObj[type][type].departmentStrategy ==
+          this.DEPARTMENT_STRATEGY['固定科室类型']) {
           // 固定科室类型,自主选择
           let params = {
             backUrl: "/pages/quickCreateOrder/quickCreateOrder?isShow=true", //返回的url
@@ -460,7 +458,7 @@
             ids: this.dataObj[type].deptIds || '',
             departmentStrategy: this.dataObj[type][type].departmentStrategy, //固定科室类型,自主选择
           };
-          if (this.dataObj[type][type].departmentStrategy == 205) {
+          if (this.dataObj[type][type].departmentStrategy == this.DEPARTMENT_STRATEGY['固定科室类型']) {
             //固定科室类型
             params.deptType = this.dataObj[type][type][type + 'TypeId']; //科室类型
           }
@@ -472,7 +470,7 @@
       }
     },
     onLoad(queryParams) {
-      this.patientMsg = `您选择类型为<b class="green">${this.patientTaskTypeName}</b>，需要填写科室，选择完成后点击下一步`;
+      this.patientMsg = `您选择类型为<b class="green">${this.patientTaskType.taskName}</b>，需要填写科室，选择完成后点击下一步`;
       this.queryParams = queryParams;
       if (this.qucikCreateOrderType === 'patient') {
         //患者建单选科室

pages/searchDept/searchDept.vue

@@ -47,9 +47,13 @@
     mapState,
     mapMutations
   } from "vuex";
+  import {
+    DEPARTMENT_STRATEGY
+  } from "../../utils/enum.departmentStrategy.js";
   export default {
     data() {
       return {
+        DEPARTMENT_STRATEGY,
         keyword: "",
         oldKeywordList: [],
         keywordList: [],
@@ -145,7 +149,7 @@
           postData.department.ids = this.searchDeptParams.ids;
           postData.department.keyWord = keyword;
           postData.department.nurseSign = 1;
-          if (this.searchDeptParams.departmentStrategy == 205) {
+          if (this.searchDeptParams.departmentStrategy == this.DEPARTMENT_STRATEGY['固定科室类型']) {
             // 固定科室类型
             postData.department.type = {
               id: this.searchDeptParams.deptType,

request/config.js

@@ -11,7 +11,8 @@ const config = {
 };
 // 后端服务地址
 const baseUrls = {
-  development: "http://192.168.3.108/service", //开发环境
+  // development: "http://192.168.3.108/service", //开发环境
+  development: "http://192.168.3.69/service", //开发环境
   production: "http://192.168.3.108/service", //生产环境
 };
 config.baseUrl = baseUrls[process.env.NODE_ENV];

store/modules/other.js

@@ -6,7 +6,8 @@ const stateReset = {
   qucikCreateOrderTypeId: "", //快捷建单类型id
   patientBuildTrip: {}, //患者建单的buildTrip
   patientBuildData: {}, //患者建单的请求参数数据
-  patientTaskTypeName: '', //患者建单的任务类型名称
+  patientTaskType: '', //患者建单的任务类型
+  selectedPatient: {}, //患者建单的选中的患者
   deptDisplay: 1, //护士端科室显示选择(名称还是别名)1是名称，2是别名
   updateTipsForNurses: "", //护士端更新提示
   specimenButton: "", //标本按钮文字
@@ -26,8 +27,8 @@ const state = cloneDeep(stateReset);
 const getters = {};
 const mutations = {
   // 重置数据
-  resetVxOther(state,args = {}) {
-    Object.assign(state, cloneDeep(stateReset),pick(args,Object.keys(cloneDeep(stateReset))));
+  resetVxOther(state, args = {}) {
+    Object.assign(state, cloneDeep(stateReset), pick(args, Object.keys(cloneDeep(stateReset))));
   },
   //是否显示切换科室弹窗
   changeSeiminModel(state, args) {
@@ -38,7 +39,8 @@ const mutations = {
     state.qucikCreateOrderType = args.type;
     state.qucikCreateOrderTypeId = args.taskTypeId;
     state.patientBuildTrip = args.patientBuildTrip;
-    state.patientTaskTypeName = args.patientTaskTypeName;
+    state.patientTaskType = args.patientTaskType;
+    state.selectedPatient = args.selectedPatient;
   },
   //护士端科室显示选择(名称还是别名)1是名称，2是别名
   changeDeptDisplay(state, args) {

uni.scss

@@ -55,6 +55,7 @@ $textColorYellow: #F5A623;
 }
 //底部凹弧形边
 @mixin arc_edge($height:200rpx) {
+  overflow: hidden;
   height: $height;
   position: relative;
   background: $defaultColor;

utils/enum.departmentStrategy.js

@@ -0,0 +1,29 @@
+import {
+  createEnum
+} from './index.js';
+let data = [{
+    name: '默认发起科室',
+    value: '201'
+  },
+  {
+    name: '固定科室范围',
+    value: '202'
+  },
+  {
+    name: '固定科室',
+    value: '203'
+  },
+  {
+    name: '自主填写',
+    value: '204'
+  },
+  {
+    name: '固定科室类型',
+    value: '205'
+  },
+  {
+    name: '默认患者所在科室',
+    value: '206'
+  },
+]
+export const DEPARTMENT_STRATEGY = createEnum(data); //运送过程科室策略

utils/enum.workorderEvaluation.js

@@ -22,4 +22,4 @@ let data = [{
     value: '358'
   },
 ]
-export const WORKORDEREVALUATION = createEnum(data); //工单评价
+export const WORKORDER_EVALUATION = createEnum(data); //工单评价

utils/index.js

@@ -5,7 +5,7 @@ import {
   enc
 } from "crypto-js";
 import {
-  WORKORDEREVALUATION
+  WORKORDER_EVALUATION
 } from "./enum.workorderEvaluation.js";
 import {
   reqDelWorkOrder,
@@ -73,23 +73,23 @@ export function showAppraise(id, callBack) {
           switch (this.$refs.seiminModel.stars.indexOf('pda-haoping1')) {
             case -1:
               //五星
-              serviceEvaluationId = WORKORDEREVALUATION['非常好评'];
+              serviceEvaluationId = WORKORDER_EVALUATION['非常好评'];
               break;
             case 1:
               //一星
-              serviceEvaluationId = WORKORDEREVALUATION['极差'];
+              serviceEvaluationId = WORKORDER_EVALUATION['极差'];
               break;
             case 2:
               //二星
-              serviceEvaluationId = WORKORDEREVALUATION['差'];
+              serviceEvaluationId = WORKORDER_EVALUATION['差'];
               break;
             case 3:
               //三星
-              serviceEvaluationId = WORKORDEREVALUATION['一般'];
+              serviceEvaluationId = WORKORDER_EVALUATION['一般'];
               break;
             case 4:
               //四星
-              serviceEvaluationId = WORKORDEREVALUATION['好评'];
+              serviceEvaluationId = WORKORDER_EVALUATION['好评'];
               break;
           }
           let postData = {