患者建单

App.vue

@@ -1,31 +1,31 @@
 <script>
-	export default {
-		onLaunch: function() {
-			console.log("App Launch");
-		},
-		onShow: function() {
-			console.log("App Show");
-		},
-		onHide: function() {
-			console.log("App Hide");
-		},
-		onPageNotFound(res) {
-			wx.reLaunch({
-				url: '/pages/login/login',
-			})
-		},
-	};
+  export default {
+    onLaunch: function() {
+      console.log("App Launch");
+    },
+    onShow: function() {
+      console.log("App Show");
+    },
+    onHide: function() {
+      console.log("App Hide");
+    },
+    onPageNotFound(res) {
+      wx.reLaunch({
+        url: '/pages/login/login',
+      })
+    },
+  };
 </script>
 
 <style lang="scss">
-	/*每个页面公共css */
-	// @import "@/uni_modules/uni-scss/index.scss";
-	// 设置整个项目的样式
-	page {
-		background-color: #f9fafb;
+  /*每个页面公共css */
+  // @import "@/uni_modules/uni-scss/index.scss";
+  // 设置整个项目的样式
+  page {
+    background-color: #f9fafb;
 
-		* {
-			box-sizing: border-box;
-		}
-	}
+    * {
+      box-sizing: border-box;
+    }
+  }
 </style>

components/seiminModel/seiminModel.vue

@@ -48,6 +48,29 @@
           </view>
         </view>
       </view>
+      <!-- 预约时间 -->
+      <view class="seiminModel_content yyDate" v-else-if="opts.skin === 'yyDate'">
+        <view class="yyDate_txt" v-html="opts.content"></view>
+        <view class="yyDate_date_time">
+          <picker mode="multiSelector" @click.native="clickDate" @columnchange="columnchangeDate($event)"
+            @change="changeDate($event)" :value="dateIndex" :range="dateOptions">
+            <view class="yyDate_date"><text>{{dateVal}}</text><text class="pda pda-icon"></text></view>
+          </picker>
+          <picker mode="multiSelector" @click.native="clickTime" @columnchange="columnchangeTime($event)"
+            @change="changeTime($event)" :value="timeIndex" :range="timeOptions">
+            <view class="yyDate_time"><text>{{timeVal}}</text><text class="pda pda-shouye8"></text></view>
+          </picker>
+        </view>
+        <view class="yyDate_tips red" v-if="!dateVal">
+          请选择日期
+        </view>
+        <view class="yyDate_tips red" v-else-if="!timeVal">
+          请选择时间
+        </view>
+        <view class="yyDate_nextDay" @click="nextDay" v-if="dateVal">
+          下一日
+        </view>
+      </view>
       <!-- 正常弹窗 -->
       <view class="seiminModel_content" v-else>
         <!-- 图标 -->
@@ -79,10 +102,38 @@
   import {
     reqDeptCodes
   } from "../../request/api.js";
+  import {
+    generateArray
+  } from '../../utils/index.js';
+  import {
+    format,
+    endOfMonth,
+    addDays,
+  } from 'date-fns';
   export default {
     name: "seiminModel",
+    props: {
+      // 其他数据
+      otherData: {
+        type: Object,
+        default: () => ({})
+      }
+    },
     data() {
       return {
+        dateOptions: [
+          [],
+          [],
+          []
+        ],
+        dateIndex: [0, 0, 0],
+        dateVal: '',
+        timeOptions: [
+          [],
+          []
+        ],
+        timeIndex: [0, 0],
+        timeVal: '',
         // 配置项
         opts: {},
         // 动态二维码定时器
@@ -120,6 +171,193 @@
       ...mapState("login", ["loginInfo"]),
     },
     methods: {
+      // 下一日
+      nextDay() {
+        let arr = this.dateVal.split('-');
+        let d_year = Number(arr[0]);
+        let d_month = Number(arr[1]) - 1;
+        let d_day = Number(arr[2]);
+        let date = addDays(new Date(d_year, d_month, d_day, 0, 0, 0), 1);
+        let year = format(date, 'yyyy');
+        let month = format(date, 'MM');
+        let day = format(date, 'dd');
+        let year_i = this.dateOptions[0].findIndex(v => v === year);
+        let month_i = this.dateOptions[1].findIndex(v => v === month);
+        let day_i = this.dateOptions[2].findIndex(v => v === day);
+        console.log(year_i, month_i, day_i, this.dateOptions, year, month, day)
+        this.dateIndex = [year_i, month_i, day_i];
+        this.dateVal = format(date, 'yyyy-MM-dd');
+
+      },
+      // 点击日期
+      clickDate() {
+        if (!this.dateVal) {
+          this.dateIndex = [0, 0, 0];
+        }
+      },
+      // 点击时间
+      clickTime() {
+        console.log(this.timeVal)
+        if (!this.timeVal) {
+          this.timeIndex = [0, 0];
+        }
+        let now = new Date();
+        let year = now.getFullYear();
+        let month = now.getMonth();
+        let day = now.getDate();
+        let hour = now.getHours();
+        let minute = now.getMinutes();
+        let second = now.getSeconds();
+        if (this.dateVal) {
+          let arr = this.dateVal.split('-');
+          let d_year = Number(arr[0]);
+          let d_month = Number(arr[1]) - 1;
+          let d_day = Number(arr[2]);
+          let c_d_day = Number(format(endOfMonth(new Date(d_year, d_month, d_day, 0, 0, 0)), 'dd'));
+          if (year != d_year || month != d_month || day != d_day) {
+            this.timeOptions = [generateArray(0, 23), ['00', '30']];
+          }
+          if (this.timeVal) {
+            let arr = this.timeVal.split(':');
+            let i1 = this.timeOptions[0].findIndex(v => v === arr[0]);
+            console.log(i1)
+            let i2 = this.timeOptions[1].length > 1 ? 30 : 0;
+            if (i1) {
+              this.timeOptions[1] = ['00', '30'];
+            }
+            this.timeIndex = [i1, i2];
+          }
+        }
+      },
+      // 滚动日期picker
+      columnchangeDate(e) {
+        console.log(e.detail);
+        console.log(this.dateOptions, this.dateIndex);
+        const {
+          column, //列数
+          value, //索引
+        } = e.detail;
+        let now = new Date();
+        let year = now.getFullYear();
+        let month = now.getMonth();
+        let day = now.getDate();
+        let hour = now.getHours();
+        let minute = now.getMinutes();
+        let second = now.getSeconds();
+        let c_day = Number(format(endOfMonth(new Date(year, month, day, 0, 0, 0)), 'dd'));
+        if (column === 0) {
+          // 年
+          if (year != this.dateOptions[column][value]) {
+            this.dateOptions[1] = generateArray(1, 12);
+            this.dateOptions[2] = generateArray(1, c_day);
+          } else {
+            this.dateOptions[1] = generateArray(month + 1, 12);
+            this.dateOptions[2] = generateArray(day, c_day);
+          }
+          this.dateIndex = [value, 0, 0];
+        }
+        if (column === 1) {
+          // 月
+          if ((month + 1) != this.dateOptions[column][value]) {
+            this.dateOptions[2] = generateArray(1, c_day);
+          } else {
+            this.dateOptions[2] = generateArray(day, c_day);
+          }
+          this.dateIndex = [this.dateIndex[0], value, 0];
+        }
+      },
+      // 滚动时间picker
+      columnchangeTime(e) {
+        console.log(e.detail);
+        console.log(this.timeOptions);
+        const {
+          column, //列数
+          value, //索引
+        } = e.detail;
+        let now = new Date();
+        let year = now.getFullYear();
+        let month = now.getMonth();
+        let day = now.getDate();
+        let hour = now.getHours();
+        let minute = now.getMinutes();
+        let second = now.getSeconds();
+        if (column === 0) {
+          // 月份
+          if (hour != this.timeOptions[column][value]) {
+            this.timeOptions[1] = ['00', '30'];
+          }
+        }
+      },
+      // 修改日期
+      changeDate(e) {
+        console.log(e.target.value);
+        this.dateIndex = e.target.value;
+        this.timeVal = '';
+        this.dateVal =
+          `${this.dateOptions[0][this.dateIndex[0]]}-${this.dateOptions[1][this.dateIndex[1]]}-${this.dateOptions[2][this.dateIndex[2]]}`;
+      },
+      // 修改时间
+      changeTime(e) {
+        console.log(e.target.value);
+        this.timeIndex = e.target.value;
+        this.timeVal = `${this.timeOptions[0][this.timeIndex[0]]}:${this.timeOptions[1][this.timeIndex[1]]}`;
+      },
+      // 日期时间的可选范围
+      dateTimeScope() {
+        let now = new Date();
+        let year = Number(format(now, 'yyyy'));
+        let month = Number(format(now, 'MM'));
+        let day = Number(format(now, 'dd'));
+        let hour = Number(format(now, 'HH'));
+        let minute = Number(format(now, 'mm'));
+        let c_day = Number(format(endOfMonth(now), 'dd'));
+        console.log(year, month, day, hour, minute);
+        // 判断分钟
+        if (minute >= 0 && minute < 30) {
+          this.timeOptions = [generateArray(hour, 23), ['30']];
+          this.dateOptions = [
+            generateArray(year, year + 1),
+            generateArray(month, 12),
+            generateArray(day, c_day)
+          ];
+        } else {
+          // 跨分钟
+          this.timeOptions = [generateArray(hour == 23 ? 0 : hour + 1, 23), ['00', '30']];
+          // 跨小时
+          if (hour == 23) {
+            // 跨日
+            if (day == c_day) {
+              // 跨月
+              if (month == 12) {
+                // 跨月
+                this.dateOptions = [
+                  generateArray(year + 1, year + 1),
+                  generateArray(0, 12),
+                  generateArray(0, c_day)
+                ]
+              } else {
+                this.dateOptions = [
+                  generateArray(year, year + 1),
+                  generateArray(month + 1, 12),
+                  generateArray(0, c_day)
+                ]
+              }
+            } else {
+              this.dateOptions = [
+                generateArray(year, year + 1),
+                generateArray(month, 12),
+                generateArray(day + 1, c_day)
+              ]
+            }
+          } else {
+            this.dateOptions = [
+              generateArray(year, year + 1),
+              generateArray(month, 12),
+              generateArray(day, c_day)
+            ];
+          }
+        }
+      },
       // 显示弹窗
       show(args = {}) {
         // 默认配置项
@@ -172,6 +410,19 @@
         } else if (this.opts.skin === 'evaluate') {
           // 如果是评价弹窗，则默认选中五个笑脸
           this.stars = ['pda-haoping', 'pda-haoping', 'pda-haoping', 'pda-haoping', 'pda-haoping'];
+        } else if (this.opts.skin === 'yyDate') {
+          console.log(this.otherData);
+          // 回显
+          if (this.otherData.date) {
+            //回显日期
+            this.dateVal = format(this.otherData.timestamp, 'yyyy-MM-dd');
+          }
+          if (this.otherData.time) {
+            //回显日期
+            this.timeVal = format(this.otherData.timestamp, 'HH:mm');
+          }
+          // 日期时间的可选范围
+          this.dateTimeScope();
         }
       },
       // 关闭弹窗
@@ -397,6 +648,62 @@
               }
             }
           }
+
+          // 预约时间
+          &.yyDate {
+            padding: 56rpx 0 82rpx;
+
+            .yyDate_txt {
+              font-size: 28rpx;
+              color: #666;
+              padding-bottom: 20rpx;
+              @include border(bottom);
+            }
+
+            .yyDate_date_time {
+              font-size: 32rpx;
+              color: #333;
+              @include flex;
+
+              .pda {
+                font-size: 44rpx;
+              }
+
+              .yyDate_date {
+                width: 260rpx;
+                height: 66rpx;
+                margin: 0 14rpx;
+                padding: 0 8rpx;
+                background-color: #fff;
+                @include border(all, #8E9D9E);
+                @include flex(space-between, center);
+              }
+
+              .yyDate_time {
+                width: 164rpx;
+                height: 66rpx;
+                margin: 0 14rpx;
+                padding: 0 8rpx;
+                background-color: #fff;
+                @include border(all, #8E9D9E);
+                @include flex(space-between, center);
+              }
+            }
+
+            .yyDate_nextDay {
+              margin-top: 42rpx;
+              color: $defaultColor;
+              text-align: left;
+              padding: 0 14rpx;
+              text-decoration: underline;
+            }
+
+            .yyDate_tips {
+              padding: 8rpx;
+              font-size: 28rpx;
+              text-align: left;
+            }
+          }
         }
 
         .seiminModel_footer {

pages.json

@@ -75,7 +75,8 @@
           "titleNView": false
         },
         "navigationBarTitleText": "患者列表",
-        "navigationBarBackgroundColor": "#2C2D31"
+        "navigationBarBackgroundColor": "#2C2D31",
+        "enablePullDownRefresh": true
       }
 
     }, {
@@ -108,6 +109,16 @@
         "navigationBarBackgroundColor": "#2C2D31"
       }
 
+    }, {
+      "path": "pages/patientBuildConfirm/patientBuildConfirm",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "navigationBarTitleText": "建单",
+        "navigationBarBackgroundColor": "#2C2D31"
+      }
+
     }
   ],
   "globalStyle": {

pages/appointmentInspect/appointmentInspect.vue

@@ -1,11 +1,16 @@
 <template>
   <view class="appointmentInspect">
-    <view class="qco_msg" v-html="patientMsg"></view>
-    <view class="select_block_wrap">
+    <view class="qco_msg" id="qco_msg">
+      <view class="qco_msg1" v-html="patientMsg"></view>
+      <view class="qco_msg2 red" v-if="isMoreDept">您选择的检查包含了多个科室，请您只包含一个科室</view>
+    </view>
+    <view class="select_block_wrap" :style="{paddingTop:qcoHeight+'px'}">
       <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">
+              <image class="ji" src="../../static/imgs/icon_ji.png" mode="widthFix" v-if="inspect.priority == 1">
+              </image>
               <view class="inspect_listItem_header">
                 <view class="inspect_listItem_header_title">
                   <checkbox color="#09BB07" :value="inspect.value" :checked="inspect.checked" />
@@ -38,7 +43,8 @@
 <script>
   import cloneDeep from 'lodash/cloneDeep';
   import {
-    mapState
+    mapState,
+    mapMutations
   } from "vuex";
   import {
     ASSOCIATION_TYPES
@@ -47,6 +53,9 @@
     data() {
       return {
         ASSOCIATION_TYPES,
+        qcoHeight: 0,
+        // 关联检查有多个科室，但是开关设置是不允许，是否展示提示文字
+        isMoreDept: false,
         // 检查列表
         inspects: [],
         // 是否加急
@@ -64,14 +73,6 @@
           click: () => {
             uni.navigateBack();
           },
-        }, {
-          name: "下一步",
-          type: "primary",
-          click: () => {
-            uni.navigateTo({
-              url: '/pages/patientBuild/patientBuild'
-            })
-          },
         }, ],
       };
     },
@@ -80,10 +81,63 @@
       ...mapState('other', [
         "deptDisplay",
         'patientBuildTrip',
-        'selectedPatient'
+        'selectedPatient',
+        'patientTaskType',
       ]),
     },
     methods: {
+      ...mapMutations('other', ['changePatientBuildData']),
+      // qco高度变化
+      resizeQcoHeight() {
+        // 选中的检查
+        let data = this.inspects.filter(v => v.checked);
+        // 关联检查有多个科室，但是开关设置是不允许，是否展示提示文字
+        if (data.length && this.patientTaskType.isMoreDept === 0) {
+          let arr = data.filter((item) => item.execDept).map((item) => item.execDept.id);
+          arr = Array.from(new Set(arr));
+          this.isMoreDept = arr.length > 1;
+        } else {
+          this.isMoreDept = false;
+        }
+        // qoc高度设置
+        this.$nextTick(() => {
+          uni.createSelectorQuery().in(this).select('#qco_msg').boundingClientRect(data => {
+            this.qcoHeight = data.height;
+            console.log(data)
+          }).exec();
+        })
+        // 底部按钮展示
+        if (data.length && !this.isMoreDept) {
+          this.btns = [{
+            name: "上一步",
+            type: "primary",
+            click: () => {
+              uni.navigateBack();
+            },
+          }, {
+            name: "下一步",
+            type: "primary",
+            click: () => {
+              // 存储选中的检查
+              this.changePatientBuildData({
+                key: 'checks',
+                value: this.inspects.filter(v => v.checked)
+              });
+              uni.navigateTo({
+                url: '/pages/patientBuild/patientBuild'
+              })
+            },
+          }, ]
+        } else {
+          this.btns = [{
+            name: "上一步",
+            type: "primary",
+            click: () => {
+              uni.navigateBack();
+            },
+          }, ]
+        }
+      },
       // 切换是否加急
       switchChange(e) {
         this.isUrgent = e.detail.value;
@@ -102,6 +156,7 @@
             this.$set(item, 'checked', false)
           }
         }
+        this.resizeQcoHeight();
       },
       // 立即建单
       buildOrder() {
@@ -120,13 +175,15 @@
       }
     },
     onLoad(queryParams) {
+      this.resizeQcoHeight();
       this.patientMsg = `以下是患者<b class="green">${this.selectedPatient.patientName}</b>当天预约的检查，请选择本次服务的检查项`;
-      let inspects = this.patientBuildTrip.data || [];
-      inspects.map(v => {
+      let inspects = this.patientBuildTrip.data ? cloneDeep(this.patientBuildTrip.data) : [];
+      inspects.forEach(v => {
         v.label = v.inspectName;
         v.value = v.id.toString();
       });
       this.inspects = inspects
+      console.log(this.inspects)
       this.queryParams = queryParams;
     },
   };
@@ -158,14 +215,25 @@
       position: fixed;
       width: 100%;
       z-index: 99;
-      height: 144rpx;
-      padding: 32rpx;
+      padding: 32rpx 32rpx 0;
       color: #999;
       line-height: 40rpx;
       font-size: 28rpx;
       text-align: center;
     }
 
+    .qco_msg1 {
+      padding-bottom: 16rpx;
+    }
+
+    .qco_msg2 {
+      padding: 16rpx 0;
+      line-height: 40rpx;
+      font-size: 28rpx;
+      text-align: center;
+      @include border(top);
+    }
+
     .select_block_wrap {
       padding: 144rpx 24rpx 0;
 
@@ -185,6 +253,13 @@
         @include semicircle(#f9fafb, 82rpx);
         @include flex(flex-start, stretch, column);
 
+        .ji {
+          width: 60rpx;
+          position: absolute;
+          right: 0;
+          top: 0;
+        }
+
         .inspect_listItem_header {
           height: 86rpx;
           @include border($directive:bottom, $style:dashed);
@@ -232,6 +307,7 @@
 
           .inspect_listItem_item_content {
             flex: 1;
+            padding: 14rpx 0;
             @include flex(space-between, center);
 
             .inspect_listItem_item_name {

pages/patientBuild/patientBuild.vue

@@ -18,12 +18,11 @@
       </view>
       <view class="remarks_btn">
         <text class="remarks_btn_name">加急</text>
-        <switch class="remarks_btn_value" color="#09BB07" @change="switchChange" />
+        <switch class="remarks_btn_value" color="#09BB07" :checked="isUrgent" @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="remarks_tips" v-if="isYYBuild">
         <view class="tips">系统支持提前预约送检服务，您是否需要！</view>
         <view class="tips">我不需要预约，希望送检人员立即上门，点击立即建单；</view>
         <view class="tips">我需要提前预约送检服务，点击预约建单；</view>
@@ -31,7 +30,7 @@
     </view>
     <!-- 底部 -->
     <seiminFooterBtn :btns="btns"></seiminFooterBtn>
-    <seiminModel ref="seiminModel"></seiminModel>
+    <seiminModel ref="seiminModel" :otherData="{timestamp,date,time}"></seiminModel>
   </view>
 </template>
 
@@ -39,6 +38,7 @@
   import cloneDeep from 'lodash/cloneDeep';
   import {
     mapState,
+    mapMutations,
   } from "vuex";
   import {
     ASSOCIATION_TYPES
@@ -47,6 +47,16 @@
     data() {
       return {
         ASSOCIATION_TYPES,
+        // 时间戳
+        timestamp: new Date().getTime(),
+        // 预约日期
+        date: false,
+        // 预约时间
+        time: false,
+        // 预约建单按钮是否显示
+        isYYBuild: false,
+        // 有预约时间并且是选中的
+        hasYYtimeChecks: [],
         // 是否加急
         isUrgent: false,
         // 设备
@@ -65,14 +75,17 @@
       ...mapState('other', [
         'patientBuildTrip',
         'patientTaskType',
-        'selectedPatient'
+        'selectedPatient',
+        'patientBuildData',
       ]),
     },
     methods: {
+      ...mapMutations('other', ['changePatientBuildData']),
       // 切换是否加急
       switchChange(e) {
         this.isUrgent = e.detail.value;
         this.urgentRemark = '';
+        this.showBtns(!this.isUrgent);
       },
       // 选择设备
       checkboxChange: function(e) {
@@ -88,8 +101,8 @@
           }
         }
       },
-      // 立即建单
-      buildOrder() {
+      // 立即建单,isYY 是否预约建单
+      buildOrder(isYY = false) {
         console.log(this.urgentRemark)
         console.log(this.isUrgent)
         console.log(this.goods)
@@ -102,54 +115,197 @@
           })
           return;
         }
-      }
+        // 存储建单数据
+        // 设备
+        this.changePatientBuildData({
+          key: 'goods',
+          value: this.goods.filter(v => v.checked)
+        })
+        // 加急
+        this.changePatientBuildData({
+          key: 'urgent',
+          value: {
+            isUrgent: this.isUrgent,
+            urgentRemark: this.urgentRemark,
+          }
+        })
+        // 预约时间
+        this.changePatientBuildData({
+          key: 'yyTime',
+          value: isYY ? `${this.$refs.seiminModel.dateVal} ${this.$refs.seiminModel.timeVal}:00` : ''
+        })
+        // 是否预约建单
+        this.changePatientBuildData({
+          key: 'isYY',
+          value: isYY
+        })
+        // 跳转
+        uni.navigateTo({
+          url: '/pages/patientBuildConfirm/patientBuildConfirm'
+        })
+      },
+      // 需要预约建单-事件
+      yyInspectChange() {
+        if (this.patientTaskType.associationType.value === this.ASSOCIATION_TYPES['患者陪检业务']) {
+          //陪检
+          let obj = this.hasYYtimeChecks.find((item) => {
+            return (
+              new Date(item.yyTime).getTime() - new Date().getTime() >
+              this.patientTaskType.appointmentTime * 60 * 1000
+            );
+          });
+          if (obj) {
+            this.showDateTime();
+          } else {
+            this.date = true;
+            this.time = false;
+            this.timestamp = new Date().getTime();
+          }
+        } else {
+          //转运
+          this.date = true;
+          this.time = false;
+          this.timestamp = new Date().getTime();
+        }
+      },
+      // 是否加急
+      allowUrgentChange(isUrgent) {
+        if (this.isYYBuild) {
+          this.isYYBuild = !isUrgent;
+          if (!this.isYYBuild) {
+            this.date = false;
+            this.time = false;
+            this.timestamp = new Date().getTime();
+          }
+        } else {
+          this.date = false;
+          this.time = false;
+          this.timestamp = new Date().getTime();
+        }
+      },
+      //回显时间日期
+      showDateTime() {
+        //当前时间要大于生效时间
+        let isYYBuild = this.hasYYtimeChecks.every((item) => {
+          return (
+            new Date(item.yyTime).getTime() - new Date().getTime() >
+            this.patientTaskType.appointmentTime * 60 * 1000
+          );
+        });
+        //如果勾选需要预约检查
+        if (isYYBuild) {
+          //筛选离当前时间最近的
+          let timeList = this.hasYYtimeChecks
+            .map((item) => new Date(item.yyTime).getTime())
+            .sort();
+          this.date = true;
+          this.time = true;
+          this.timestamp = new Date(timeList[0] - this.patientTaskType.appointmentTime * 60 * 1000);
+        } else {
+          this.date = false;
+          this.time = false;
+          this.timestamp = new Date().getTime();
+        }
+      },
+      // 初始化
+      init() {
+        // 提示文字
+        this.patientMsg = `患者<b class="green">${this.selectedPatient.patientName}</b>即将出科，请您选择送检人员需携带哪些设备！`;
+        let goods = this.patientBuildTrip.goods ? cloneDeep(this.patientBuildTrip.goods) : []; // 设备
+        let checks = this.patientBuildTrip.checks ? cloneDeep(this.patientBuildTrip.checks) : []; // 检查
+        this.goods = goods;
+        // 患者陪检业务和患者其他服务业务相关处理
+        this.hasYYtimeChecks = checks.filter((v) => Boolean(v.yyTime));
+        let isPriority = checks.some(v => v.priority == 1);
+        // 检查有紧急度,则加急
+        if (isPriority) {
+          this.isUrgent = true;
+          this.urgentRemark = '系统根据检查信息，自动进行加急';
+        } else {
+          this.isUrgent = false;
+          this.urgentRemark = '';
+        }
+        //判断预约建单按钮
+        if (this.hasYYtimeChecks.length && this.patientTaskType.appointmentSwitch == 1) {
+          //选中的检查数组都有预约时间并且允许预约建单
+          this.isYYBuild = true;
+          this.allowUrgentChange(this.isUrgent);
+          if (!this.isUrgent) {
+            //不加急状态下，回显时间
+            this.showDateTime();
+          }
+          this.yyInspectChange();
+        } else {
+          //不允许预约建单
+          this.isYYBuild = true;
+          this.date = false;
+          this.time = false;
+          this.timestamp = new Date().getTime();
+          this.yyInspectChange();
+        }
+
+        // 底部按钮展示
+        this.showBtns(this.isYYBuild);
+      },
+      // 底部按钮展示
+      showBtns(flag) {
+        if (flag) {
+          //患者陪检业务或患者其他服务业务，并且预约建单开关打开的情况下
+          this.btns = [{
+            name: "上一步",
+            type: "primary",
+            click: () => {
+              uni.navigateBack();
+            },
+          }, {
+            name: "预约建单",
+            type: "primary",
+            click: () => {
+              this.$refs.seiminModel.show({
+                skin: 'yyDate',
+                title: '',
+                content: '请您选择希望陪检人员上门的时间',
+                btns: [{
+                    name: '取消'
+                  },
+                  {
+                    name: '预约建单',
+                    click: () => {
+                      if (this.$refs.seiminModel.dateVal && this.$refs.seiminModel.timeVal) {
+                        this.buildOrder(true);
+                      }
+                    }
+                  }
+                ]
+              })
+            },
+          }, {
+            name: "立即建单",
+            type: "primary",
+            click: () => {
+              this.buildOrder();
+            },
+          }, ];
+        } else {
+          this.btns = [{
+            name: "上一步",
+            type: "primary",
+            click: () => {
+              uni.navigateBack();
+            },
+          }, {
+            name: "立即建单",
+            type: "primary",
+            click: () => {
+              this.buildOrder();
+            },
+          }, ];
+        }
+      },
     },
     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();
-          },
-        }, ];
-      }
+      this.init();
     },
   };
 </script>

pages/patientBuildConfirm/patientBuildConfirm.vue

@@ -0,0 +1,698 @@
+<template>
+  <view class="patientBuildConfirm">
+    <view class="qco_msg" v-html="patientMsg"></view>
+    <view class="orderDetail_info">
+      <scroll-view scroll-y class="orderDetail_infoItem">
+        <view class="orderDetail_infoItem_header">
+          <view class="orderDetail_infoItem_header_title">
+            <view class="icon"></view>
+            <view class="taskNameAndWorkerName">
+              <text class="taskName">服务</text>
+            </view>
+          </view>
+          <text class="orderDetail_infoItem_header_more">{{patientTaskType.taskName||'暂无'}}</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">{{deptDisplay == 2?patientBuildData.dept.startDept.deptalias:patientBuildData.dept.startDept.dept}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content"
+            v-if="patientTaskType.associationType.value == ASSOCIATION_TYPES['患者陪检业务']">
+            <text class="orderDetail_infoItem_item_name">中间科室</text>
+            <text class="orderDetail_infoItem_item_value">{{checkDeptsName}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content">
+            <text class="orderDetail_infoItem_item_name">目标科室</text>
+            <text
+              class="orderDetail_infoItem_item_value">{{deptDisplay == 2?patientBuildData.dept.endDept.deptalias:patientBuildData.dept.endDept.dept}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content">
+            <text class="orderDetail_infoItem_item_name">携带设备</text>
+            <text class="orderDetail_infoItem_item_value">{{goodsName||'暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content">
+            <text class="orderDetail_infoItem_item_name">预约时间</text>
+            <text class="orderDetail_infoItem_item_value">{{patientBuildData.yyTime||'暂无'}}</text>
+          </view>
+          <view class="orderDetail_infoItem_item_content">
+            <text class="orderDetail_infoItem_item_name">是否紧急</text>
+            <text class="orderDetail_infoItem_item_value">{{patientBuildData.urgent.isUrgent?'是':'否'}}</text>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+    <!-- 底部 -->
+    <seiminFooterBtn :btns="btns"></seiminFooterBtn>
+    <seiminModel ref="seiminModel"></seiminModel>
+  </view>
+</template>
+
+<script>
+  import {
+    mapState,
+  } from "vuex";
+  import {
+    ASSOCIATION_TYPES
+  } from "../../utils/enum.association_types.js";
+  import {
+    SOURCEID
+  } from "../../utils/enum.sourceid.js";
+  import {
+    uniqBy
+  } from 'lodash'
+  import {
+    reqBuild
+  } from '../../request/api.js';
+  export default {
+    data() {
+      return {
+        ASSOCIATION_TYPES,
+        SOURCEID,
+        // 中间科室名称
+        checkDeptsName: '',
+        // 设备
+        goodsName: '',
+        // 预约建单按钮是否显示
+        isYYBuild: false,
+        // 有预约时间并且是选中的
+        hasYYtimeChecks: [],
+        // 是否加急
+        isUrgent: false,
+        // 设备
+        goods: [],
+        //患者建单信息展示
+        patientMsg: '请您确认一下建单信息！',
+        // 传递过来的参数
+        queryParams: {},
+        // 加急原因
+        urgentRemark: "",
+        //底部按钮
+        btns: [{
+          name: "取消",
+          type: "default",
+          click: () => {
+            uni.navigateBack();
+          },
+        }, {
+          name: "确认建单",
+          type: "primary",
+          click: () => {
+            this.buildOrder();
+          },
+        }, ],
+      };
+    },
+    computed: {
+      ...mapState('login', [
+        'loginInfo',
+      ]),
+      ...mapState('other', [
+        'deptDisplay',
+        'patientBuildTrip',
+        'patientTaskType',
+        'selectedPatient',
+        'patientBuildData',
+      ]),
+    },
+    methods: {
+      // 重复策略
+      showReaptModal(msg, postData) {
+        this.$refs.seiminModel.show({
+          icon: "warn",
+          content: msg,
+          btns: [{
+            name: "否",
+            type: "primary",
+            click: () => {
+              this.$refs.seiminModel.close();
+            },
+          }, {
+            name: "是",
+            type: "default",
+            click: () => {
+              this.$refs.seiminModel.close();
+              postData.tipsCreateOder = 1;
+              uni.showLoading({
+                mask: true,
+                title: '加载中'
+              })
+              reqBuild(this.patientBuildData.isYY ? "appointmentOrder" : "startOrder", postData)
+                .then((data) => {
+                  uni.hideLoading();
+                  if (data.status == 200) {
+                    this.$refs.seiminModel.show({
+                      skin: "toast",
+                      icon: "success",
+                      content: "创建成功",
+                    });
+                    uni.navigateTo({
+                      url: '/pages/orderList/orderList'
+                    })
+                  } else {
+                    this.$refs.seiminModel.show({
+                      skin: "toast",
+                      icon: "error",
+                      content: data.msg || "创建失败",
+                    });
+                  }
+                });
+            },
+          }, ],
+        })
+      },
+      // 是否需要护士医生陪同模态框
+      accompany(postData, yuyue, type) {
+        this.$refs.seiminModel.show({
+          icon: "warn",
+          content: "您选择的患者是危重或特级护理或一级护理患者，请问是否需要医护陪同检查？",
+          btns: [{
+            name: "否",
+            type: "primary",
+            click: () => {
+              this.$refs.seiminModel.close();
+              if (type == "patient") {
+                //患者列表直接建单
+                this.buildCommon(postData, 0, 'accompany3');
+              } else if (type == "patient-yy") {
+                //患者列表预约建单
+                this.buildCommon(postData, 0, 'accompany4');
+              }
+            },
+          }, {
+            name: "是",
+            type: "default",
+            click: () => {
+              this.$refs.seiminModel.close();
+              if (type == "patient") {
+                //患者列表直接建单
+                this.buildCommon(postData, 0, 'accompany1');
+              } else if (type == "patient-yy") {
+                //患者列表预约建单
+                this.buildCommon(postData, 0, 'accompany2');
+              }
+            },
+          }, {
+            name: "取消",
+            type: "default",
+            click: () => {
+              this.$refs.seiminModel.close();
+            },
+          }, ]
+        });
+      },
+      // 建单公共方法
+      buildCommon(postData, type1, type2) {
+        if (type1 === null) {
+          if (!this.patientBuildData.isYY) {
+            postData.workOrder.platform = 2;
+          }
+          //是否需要医护陪同检查
+          if (this.selectedPatient.careLevel && this.patientTaskType.isAccompany == 1) {
+            //特级护理或一级护理
+            if (
+              this.selectedPatient.careLevel.value === "0" ||
+              this.selectedPatient.careLevel.value === "1"
+            ) {
+              this.accompany(postData, this.patientBuildData.isYY, type2);
+              return;
+            }
+          }
+          if (
+            this.selectedPatient.illnessState &&
+            this.patientTaskType.isAccompany == 1
+          ) {
+            //病危或病重
+            if (
+              this.selectedPatient.illnessState.value === "2" ||
+              this.selectedPatient.illnessState.value === "3"
+            ) {
+              this.accompany(postData, this.patientBuildData.isYY, type2);
+              return;
+            }
+
+          }
+          postData.workOrder.isAccompany = 0; //是否需要医护陪同检查
+        } else if (typeof type1 === 'number') {
+          postData.workOrder.isAccompany = type1; //是否需要医护陪同检查
+        }
+        uni.showLoading({
+          mask: true,
+          title: '加载中'
+        })
+        reqBuild(this.patientBuildData.isYY ? "appointmentOrder" : "startOrder", postData)
+          .then((data) => {
+            uni.hideLoading();
+            if (data.status == 200) {
+              this.$refs.seiminModel.show({
+                skin: "toast",
+                icon: "success",
+                content: "创建成功",
+              });
+              uni.navigateTo({
+                url: '/pages/orderList/orderList'
+              })
+            } else if (data.status == 1000033) {
+              //重复建单那策略
+              this.showReaptModal(data.msg, postData);
+            } else {
+              this.$refs.seiminModel.show({
+                skin: "toast",
+                icon: "error",
+                content: data.msg || "创建失败",
+              });
+            }
+          });
+      },
+      // 确定建单
+      buildOrder() {
+        let postData = {
+          workOrder: {
+            sourceId: this.SOURCEID['护士端'],
+            taskType: {
+              id: this.patientTaskType.id
+            },
+            startDept: {
+              id: this.patientBuildData.dept.startDept.id
+            },
+            endDepts: [{
+              id: this.patientBuildData.dept.endDept.id
+            }],
+            createDept: this.loginInfo.user.dept.id,
+            patient: {
+              patientCode: this.selectedPatient.patientCode,
+            },
+          },
+        };
+        // 半程陪检
+        if (this.patientTaskType.associationType.value == this.ASSOCIATION_TYPES['患者陪检业务']) {
+          postData.workOrder.taskType.isHalfInspect =
+            this.patientTaskType.isHalfInspect === 1 ? 1 : 0; //半程陪检
+        }
+        // 携带设备
+        let goodIds = '';
+        goodIds = this.patientBuildData.goods ? this.patientBuildData.goods.map(v => v.id).toString() :
+          '';
+        postData.workOrder["goods"] = goodIds;
+        // 加急原因
+        if (!this.patientBuildData.isYY && this.patientTaskType.allowUrgent == 1 && this.patientBuildData.urgent
+          .isUrgent) {
+          postData.workOrder["urgentDetails"] = {
+            checkStatus: {
+              id: 329
+            },
+            urgentReason: this.patientBuildData.urgent.urgentRemark,
+          };
+        }
+        // ---------------------
+        let yy = false; //检查上是否有预约时间
+        if (this.patientBuildData.checks && this.patientBuildData.checks.length) {
+          yy = this.patientBuildData.checks.some((e) => e.yyTime);
+
+        }
+        if (
+          yy &&
+          this.patientBuildTrip.status == 200 &&
+          this.patientBuildData.checks &&
+          this.patientBuildData.checks.length
+        ) {
+          // 有预约时间
+          postData.workOrder["checkList"] = this.patientBuildData.checks || [];
+          this.$refs.seiminModel.show({
+            icon: "warn",
+            content: "您确认建单吗？",
+            btns: [{
+              name: "取消",
+              type: "default",
+              click: () => {
+                this.$refs.seiminModel.close();
+              },
+            }, {
+              name: "确认",
+              type: "primary",
+              click: () => {
+                this.$refs.seiminModel.close();
+                if (this.patientBuildData.isYY) {
+                  postData.workOrder.yyTime = this.patientBuildData.yyTime;
+                }
+                this.buildCommon(postData, null, 'patient-yy');
+              },
+            }, ]
+          });
+        } else {
+          if (!yy && this.patientBuildTrip.status == 200) {
+            postData.workOrder["checkList"] = this.patientBuildData.checks || [];
+            // 添加预约时间
+            if (this.patientBuildData.isYY) {
+              postData.workOrder.yyTime = this.patientBuildData.yyTime;
+            }
+          } else {
+            // 添加预约时间
+            if (this.patientBuildData.isYY) {
+              postData.workOrder.yyTime = this.patientBuildData.yyTime;
+            }
+          }
+          if (this.patientBuildTrip.status != 200) {
+            //微信端不需要自动送回功能
+            postData.workOrder["isRemand"] = 0;
+
+          }
+          this.buildCommon(postData, null, 'patient');
+        }
+      },
+      // 初始化
+      init() {
+        // 设备
+        this.goodsName = this.patientBuildData.goods ? this.patientBuildData.goods.map(v => v.name).toString() :
+          '';
+        if (this.patientTaskType.associationType.value == this.ASSOCIATION_TYPES['患者陪检业务']) {
+          // 患者陪检业务
+          let execDeptArr = this.patientBuildData.checks.map(v => v.execDept);
+          execDeptArr = uniqBy(execDeptArr, 'id');
+          console.log(execDeptArr)
+          this.checkDeptsName = execDeptArr.map(v => {
+            return this.deptDisplay == 2 ? v.deptalias : v.dept;
+          }).toString();
+        }
+      },
+    },
+    onLoad(queryParams) {
+      this.queryParams = queryParams;
+      this.init();
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .patientBuildConfirm {
+    margin-bottom: 100rpx;
+
+    .qco_msg {
+      padding: 32rpx;
+      color: #999;
+      line-height: 40rpx;
+      font-size: 28rpx;
+      text-align: center;
+    }
+
+    .orderDetail_info {
+      padding: 0 24rpx;
+
+      .orderDetail_infoItem {
+        width: 702rpx;
+        height: calc(100vh - 240rpx);
+        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: $defaultColor;
+            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);
+
+          &.process {
+            padding-top: 90rpx;
+            padding-bottom: 90rpx;
+          }
+
+          &: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;
+            }
+          }
+
+          // 流程信息
+          .orderDetail_process_item {
+            min-height: 120rpx;
+            line-height: 50rpx;
+            color: #333;
+            @include flex(center);
+
+            &:last-of-type {
+              .step_icon {
+                &::after {
+                  display: none;
+                }
+              }
+            }
+
+            .step_infoStart {
+              font-size: 28rpx;
+              flex: 1;
+              @include flex(flex-end);
+
+              .step_time {
+                margin-left: 16rpx;
+              }
+            }
+
+            .step_icon {
+              font-size: 38rpx;
+              margin-left: 30rpx;
+              margin-right: 30rpx;
+              position: relative;
+              color: #E5E9ED;
+
+              &.active {
+                color: #07863C;
+              }
+
+              &::after {
+                content: '';
+                position: absolute;
+                top: 60rpx;
+                left: 18rpx;
+                width: 1px;
+                height: calc(100% - 70rpx);
+                background-color: #DDE1E5;
+              }
+            }
+
+            .step_infoEnd {
+              font-size: 34rpx;
+              flex: 1;
+              padding-bottom: 16rpx;
+            }
+          }
+
+          // 业务信息-检查
+          &.business_inspect {
+            .inspect_info {
+              font-size: 34rpx;
+              color: #333;
+              padding-top: 20rpx;
+              padding-bottom: 20rpx;
+              @include border($directive:bottom, $style:dashed);
+
+              .inspect_info_block {
+                height: 60rpx;
+                @include flex(space-between, center);
+
+                .inspect_info_left {
+                  @include flex;
+
+                  .inspect_info_icon {
+                    width: 50rpx;
+                    height: 50rpx;
+                    line-height: 50rpx;
+                    border-radius: 50%;
+                    font-size: 28rpx;
+                    margin-right: 8rpx;
+                    @include flex(center, center);
+
+                    &.green {
+                      color: $defaultColor;
+                      border: 1px solid $defaultColor;
+                      background-color: rgba(73, 184, 86, 0.1);
+                    }
+
+                    &.red {
+                      color: #FF3B53;
+                      border: 1px solid #FF3B53;
+                      background-color: #FFE8EB;
+                    }
+                  }
+
+                  .inspect_info_name {
+                    font-weight: bold;
+                  }
+                }
+
+                .inspect_info_right {
+                  font-weight: bold;
+                }
+              }
+            }
+
+            .inspect_item {
+              color: #333;
+              font-size: 34rpx;
+              line-height: 48rpx;
+              padding-top: 26rpx;
+              padding-bottom: 26rpx;
+              @include border($directive:bottom, $style:dashed);
+
+              .inspect_item_name {
+                font-weight: bold;
+              }
+
+              .inspect_item_yytime {
+                font-weight: bold;
+              }
+
+              .inspect_item_info {
+                margin-top: 16rpx;
+                margin-bottom: 16rpx;
+                @include flex(space-between, center);
+
+                .inspect_item_dept {
+                  flex: 1;
+                  word-break: break-all;
+                  @include clamp;
+                }
+
+                .inspect_item_number {
+                  flex: 1;
+                  text-align: right;
+                  word-break: break-all;
+                  @include clamp;
+                }
+              }
+            }
+          }
+
+          // 业务信息-标本
+          &.business_specimen {
+            font-size: 34rpx;
+
+            .th {
+              background-color: red;
+              @include btn_background;
+
+              th {
+                color: #fff;
+              }
+            }
+
+            .td {
+              position: relative;
+
+              .urgent {
+                width: 60rpx;
+                position: absolute !important;
+                right: 0;
+                top: 0;
+              }
+            }
+
+            .table--border {
+              border: none;
+            }
+
+            ::v-deep .uni-table {
+              min-width: 0;
+            }
+
+            ::v-deep .uni-table-td {
+              word-break: break-all;
+            }
+          }
+
+          // 业务信息-药品
+          &.business_drugsBag {
+            .drugsBag_item {
+              color: #333;
+              font-size: 34rpx;
+              margin-top: 20rpx;
+              @include flex(space-between, center);
+
+              .drugsBag_item_name {}
+
+              .drugsBag_item_value {
+                font-weight: bold;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+</style>

pages/patientList/patientList.vue

@@ -82,7 +82,7 @@
       ...mapState('other', ["deptDisplay"]),
     },
     methods: {
-      ...mapMutations('other', ['changeQucikCreateOrderType']),
+      ...mapMutations('other', ['changeQucikCreateOrderType', 'clearPatientBuildData', 'changePatientBuildData']),
       //关闭
       closePicker() {
         this.$refs.sPicker._close();
@@ -94,6 +94,8 @@
       //确定：接收子组件传来的参数
       confirmPicker(checkedObj) {
         console.log(checkedObj);
+        // 补充：清除建单数据
+        this.clearPatientBuildData();
         // 2,获取buildTrip信息
         let postData = {
           "taskTypeId": checkedObj.value,
@@ -126,6 +128,13 @@
               } else {
                 //无需选择科室
                 this.checkedShowMsg = res.data;
+                this.changePatientBuildData({
+                  key: 'dept',
+                  value: {
+                    startDept: res.start.start.list[0],
+                    endDept: res.end.end.list[0],
+                  }
+                });
                 this.changeQucikCreateOrderType({
                   type: "patient",
                   taskTypeId: checkedObj.value,
@@ -149,6 +158,21 @@
             // 患者陪检业务
             if (res.status == 200) {
               this.checkedShowMsg = res.data;
+              this.changePatientBuildData({
+                key: 'dept',
+                value: {
+                  startDept: {
+                    id: 9,
+                    dept: 'xxx',
+                    deptalias: 'xxxxxx'
+                  }, //待改
+                  endDept: {
+                    id: 9,
+                    dept: 'xxx',
+                    deptalias: 'xxxxxx'
+                  }, //待改
+                }
+              });
               this.changeQucikCreateOrderType({
                 type: "patient",
                 taskTypeId: checkedObj.value,
@@ -230,6 +254,7 @@
         });
         reqFetchDataList("nurse", "patient", postData).then((res) => {
           uni.hideLoading();
+          uni.stopPullDownRefresh();
           if (res.status == 200) {
             res.list = res.list || [];
             if (idxPlus) {
@@ -265,6 +290,9 @@
     onReachBottom() {
       this.reachBottom();
     },
+    onPullDownRefresh() {
+      this.inputChange(this.keyword)
+    },
     created() {
       this.debounceInp = debounce(this.inputChange, 500);
     },
@@ -272,7 +300,7 @@
       this.debounceInp.cancel()
     },
     onLoad() {
-      this.inputChange('');
+      this.inputChange();
     },
   };
 </script>

pages/quickCreateOrder/quickCreateOrder.vue

@@ -6,8 +6,8 @@
     <block
       v-if="(qucikCreateOrderType === 'other' || qucikCreateOrderType === 'patient') && (dataObj.start || dataObj.end)">
       <view class="select_block" @click="selectDept('start')"
-        v-if="qucikCreateOrderType !== 'patient'||(qucikCreateOrderType === 'patient'&&!(dataObj.start.start.departmentStrategy == DEPARTMENT_STRATEGY['默认发起科室'] || dataObj.start.start.departmentStrategy == DEPARTMENT_STRATEGY['固定科室']))">
-        <!-- 默认科室和固定科室 -->
+        v-if="qucikCreateOrderType !== 'patient'||(qucikCreateOrderType === 'patient'&&!(dataObj.start.start.departmentStrategy == DEPARTMENT_STRATEGY['默认发起科室'] || dataObj.start.start.departmentStrategy == DEPARTMENT_STRATEGY['固定科室']|| dataObj.start.start.departmentStrategy == DEPARTMENT_STRATEGY['默认患者所在科室']))">
+        <!-- 默认科室和固定科室和默认患者所在科室 -->
         <text class="select_label"
           :class="{disableColor:dataObj.start.start.departmentStrategy == DEPARTMENT_STRATEGY['默认发起科室'] || dataObj.start.start.departmentStrategy == DEPARTMENT_STRATEGY['固定科室']}">起点科室</text>
         <view class="select_placeholder"
@@ -21,8 +21,8 @@
         </view>
       </view>
       <view class="select_block" @click="selectDept('end')"
-        v-if="qucikCreateOrderType !== 'patient'||(qucikCreateOrderType === 'patient'&&!(dataObj.end.end.departmentStrategy == DEPARTMENT_STRATEGY['默认发起科室'] || dataObj.end.end.departmentStrategy == DEPARTMENT_STRATEGY['固定科室']))">
-        <!-- 默认科室和固定科室 -->
+        v-if="qucikCreateOrderType !== 'patient'||(qucikCreateOrderType === 'patient'&&!(dataObj.end.end.departmentStrategy == DEPARTMENT_STRATEGY['默认发起科室'] || dataObj.end.end.departmentStrategy == DEPARTMENT_STRATEGY['固定科室']|| dataObj.end.end.departmentStrategy == DEPARTMENT_STRATEGY['默认患者所在科室']))">
+        <!-- 默认科室和固定科室和默认患者所在科室 -->
         <text class="select_label"
           :class="{disableColor:dataObj.end.end.departmentStrategy == DEPARTMENT_STRATEGY['默认发起科室'] || dataObj.end.end.departmentStrategy == DEPARTMENT_STRATEGY['固定科室']}">终点科室</text>
         <view class="select_placeholder"
@@ -149,7 +149,7 @@
               type: "default",
               click: () => {
                 uni.navigateTo({
-                  url:'/pages/patientList/patientList'
+                  url: '/pages/patientList/patientList'
                 })
               },
             },
@@ -157,6 +157,13 @@
               name: "下一步",
               type: "primary",
               click: () => {
+                this.changePatientBuildData({
+                  key: 'dept',
+                  value: {
+                    startDept: newVal.startDept,
+                    endDept: newVal.endDept,
+                  }
+                })
                 uni.navigateTo({
                   url: "/pages/patientBuild/patientBuild",
                 });
@@ -169,7 +176,7 @@
             type: "default",
             click: () => {
               uni.navigateTo({
-                url:'/pages/patientList/patientList'
+                url: '/pages/patientList/patientList'
               })
             },
           }, ];
@@ -177,7 +184,7 @@
       }
     },
     methods: {
-      ...mapMutations('other', ['changeSearchDeptParams', 'changeSearchDeptResultList']),
+      ...mapMutations('other', ['changeSearchDeptParams', 'changeSearchDeptResultList', 'changePatientBuildData']),
       // 添加备注
       addRemarks(customRemark) {
         this.remarksFocus = false;
@@ -244,8 +251,9 @@
             res.msg = res.msg.replace(/<\/b>/g, "</text>");
           }
           if (res.start) {
-            //其他服务建单
+            //其他服务或患者其他服务业务
             if (
+              res.start.start.departmentStrategy == this.DEPARTMENT_STRATEGY['默认患者所在科室'] ||
               res.start.start.departmentStrategy == this.DEPARTMENT_STRATEGY['默认发起科室'] ||
               res.start.start.departmentStrategy == this.DEPARTMENT_STRATEGY['固定科室']) {
               this.startDept = res.start.start.list[0];
@@ -264,8 +272,9 @@
             }
           }
           if (res.end) {
-            //其他服务建单
+            //其他服务或患者其他服务业务
             if (
+              res.end.end.departmentStrategy == this.DEPARTMENT_STRATEGY['默认患者所在科室'] ||
               res.end.end.departmentStrategy == this.DEPARTMENT_STRATEGY['默认发起科室'] ||
               res.end.end.departmentStrategy == this.DEPARTMENT_STRATEGY['固定科室']) {
               this.endDept = res.end.end.list[0];
@@ -449,7 +458,8 @@
           }))
           console.log(this.deptList, this.pickerTitle)
           this.openPicker();
-        } else if (this.dataObj[type][type].departmentStrategy == this.DEPARTMENT_STRATEGY['自主填写'] || this.dataObj[type][type].departmentStrategy ==
+        } else if (this.dataObj[type][type].departmentStrategy == this.DEPARTMENT_STRATEGY['自主填写'] || this.dataObj[type]
+          [type].departmentStrategy ==
           this.DEPARTMENT_STRATEGY['固定科室类型']) {
           // 固定科室类型,自主选择
           let params = {
@@ -470,16 +480,16 @@
       }
     },
     onLoad(queryParams) {
-      this.patientMsg = `您选择类型为<b class="green">${this.patientTaskType.taskName}</b>，需要填写科室，选择完成后点击下一步`;
       this.queryParams = queryParams;
       if (this.qucikCreateOrderType === 'patient') {
+        this.patientMsg = `您选择类型为<b class="green">${this.patientTaskType.taskName}</b>，需要填写科室，选择完成后点击下一步`;
         //患者建单选科室
         this.btns = [{
           name: "返回列表",
           type: "default",
           click: () => {
             uni.navigateTo({
-              url:'/pages/patientList/patientList'
+              url: '/pages/patientList/patientList'
             })
           },
         }, ];

request/api.js

@@ -143,7 +143,7 @@ export const reqGetPatientInspectInfo = (postData) =>
     data: postData,
     method: 'POST'
   });
-  
+
 // 患者一键建单请求任务类型
 export const reqDeptTSPTaskType = (postData) =>
   request({
@@ -151,3 +151,11 @@ export const reqDeptTSPTaskType = (postData) =>
     data: postData,
     method: 'POST'
   });
+
+// 患者建单接口
+export const reqBuild = (type, postData) =>
+  request({
+    url: `/api/${type}`,
+    data: postData,
+    method: 'POST'
+  });

static/fonts/demo_index.html

@@ -55,6 +55,18 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon pda">&#xe621;</span>
+                <div class="name">历史记录</div>
+                <div class="code-name">&amp;#xe621;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon pda">&#xe65f;</span>
+                <div class="name">日历</div>
+                <div class="code-name">&amp;#xe65f;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon pda">&#xe636;</span>
                 <div class="name">icon_liucheng</div>
                 <div class="code-name">&amp;#xe636;</div>
@@ -156,9 +168,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'pda';
-  src: url('iconfont.woff2?t=1651907681793') format('woff2'),
-       url('iconfont.woff?t=1651907681793') format('woff'),
-       url('iconfont.ttf?t=1651907681793') format('truetype');
+  src: url('iconfont.woff2?t=1652696906310') format('woff2'),
+       url('iconfont.woff?t=1652696906310') format('woff'),
+       url('iconfont.ttf?t=1652696906310') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -185,6 +197,24 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon pda pda-shouye8"></span>
+            <div class="name">
+              历史记录
+            </div>
+            <div class="code-name">.pda-shouye8
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon pda pda-icon"></span>
+            <div class="name">
+              日历
+            </div>
+            <div class="code-name">.pda-icon
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon pda pda-icon_liucheng"></span>
             <div class="name">
               icon_liucheng
@@ -339,6 +369,22 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#pda-shouye8"></use>
+                </svg>
+                <div class="name">历史记录</div>
+                <div class="code-name">#pda-shouye8</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#pda-icon"></use>
+                </svg>
+                <div class="name">日历</div>
+                <div class="code-name">#pda-icon</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#pda-icon_liucheng"></use>
                 </svg>
                 <div class="name">icon_liucheng</div>

static/fonts/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "pda"; /* Project id 3307922 */
-  src: url('/static/fonts/iconfont.woff2?t=1651907681793') format('woff2'),
-       url('/static/fonts/iconfont.woff?t=1651907681793') format('woff'),
-       url('/static/fonts/iconfont.ttf?t=1651907681793') format('truetype');
+  src: url('/static/fonts/iconfont.woff2?t=1652696906310') format('woff2'),
+       url('/static/fonts/iconfont.woff?t=1652696906310') format('woff'),
+       url('/static/fonts/iconfont.ttf?t=1652696906310') format('truetype');
 }
 
 .pda {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.pda-shouye8:before {
+  content: "\e621";
+}
+
+.pda-icon:before {
+  content: "\e65f";
+}
+
 .pda-icon_liucheng:before {
   content: "\e636";
 }

static/fonts/iconfont.json

@@ -6,6 +6,20 @@
   "description": "转运PDA",
   "glyphs": [
     {
+      "icon_id": "765433",
+      "name": "历史记录",
+      "font_class": "shouye8",
+      "unicode": "e621",
+      "unicode_decimal": 58913
+    },
+    {
+      "icon_id": "784528",
+      "name": "日历",
+      "font_class": "icon",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
       "icon_id": "4852580",
       "name": "icon_liucheng",
       "font_class": "icon_liucheng",

store/modules/other.js

@@ -42,6 +42,14 @@ const mutations = {
     state.patientTaskType = args.patientTaskType;
     state.selectedPatient = args.selectedPatient;
   },
+  // 修改患者建单数据(checks|goods|urgent|yyTime|dept|isYY)
+  changePatientBuildData(state, args) {
+    state.patientBuildData[args.key] = args.value;
+  },
+  // 清空患者建单数据(checks|goods|urgent|yyTime|dept|isYY)
+  clearPatientBuildData(state, args) {
+    state.patientBuildData = {};
+  },
   //护士端科室显示选择(名称还是别名)1是名称，2是别名
   changeDeptDisplay(state, args) {
     state.deptDisplay = args;

uni.scss

@@ -112,6 +112,9 @@ $textColorYellow: #F5A623;
 }
 // --------------------------华丽的分割线---------------------------------------
 // 全局样式
+.uni-picker-action-confirm {
+  color: $defaultColor !important;
+}
 .w100{
   width: 100%!important;
 }

utils/index.js

@@ -14,6 +14,11 @@ import {
   reqDirectStartOrder,
 } from "../request/api.js";
 
+// 生成一个从 start 到 end 的连续数组
+export function generateArray(start, end) {
+  return Array.from(new Array(end + 1).keys()).slice(start).map(v => v.toString().padStart(2, '0'));
+}
+
 //aes加密
 export function encryptByEnAES(data = '') {
   let Key = "dsadmin";