暂存

components/seiminModel/seiminModel.vue

@@ -12,7 +12,7 @@
       <view class="seiminModel_header" :class="{noTitle:!opts.title}">
         <text>{{ opts.title }}</text>
         <text class="seiminModel_countDown" v-if="
-            nurseDeptSwitchTip < 0 || (nurseDeptSwitchTip > 0 && closeTime > 0)
+            (nurseDeptSwitchTip < 0 || (nurseDeptSwitchTip > 0 && closeTime > 0))&&isCheckDept
           ">
           <text v-if="nurseDeptSwitchTip < 0">关闭</text>倒计时<text>{{ closeTime }}s</text>
         </text>
@@ -121,6 +121,7 @@
     },
     data() {
       return {
+        isCheckDept:false,//是否是切换科室
         dateOptions: [
           [],
           [],
@@ -461,6 +462,7 @@
       },
       // 切换科室弹窗
       showChangeDept(options = {}) {
+        this.isCheckDept = true;
         this.show(options);
         // (1)	当用户设置为正数时，用户必须查看此窗体指定秒数。
         // (2)	当用户设置为负数时，用户可点击知道了也可倒计时自动关闭。

components/seiminPicker/seiminPicker.vue

@@ -81,7 +81,7 @@
         this.$emit('onConfirm', checkedObj)
       },
       // 选择初始选项
-      _changeValue(index){
+      _changeValue(index) {
         this.pickerValue = [index];
       },
       //滑动picker

pages/appointmentInspect/appointmentInspect.vue

@@ -4,7 +4,7 @@
       <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="select_block_wrap" :style="{mariginTop:qcoHeight+'px'}">
       <view class="uni-list">
         <checkbox-group @change="checkboxChange">
           <scroll-view scroll-y class="scrollHeight">

pages/detail/detail.vue

@@ -98,7 +98,7 @@
         </view>
       </scroll-view>
     </view>
-    <!-- 流程信息 -->
+    <!-- 过程信息 -->
     <view class="orderDetail_info" v-show="selectedTab === 3">
       <scroll-view scroll-y class="orderDetail_infoItem">
         <view class="orderDetail_infoItem_header">
@@ -109,6 +109,24 @@
             </view>
           </view>
         </view>
+        <view class="orderDetail_infoItem_item process">
+          <block v-if="logList.length">
+            <view class="orderDetail_process_item" v-for="(step,i) in logList" :key="i">
+              <view class="step_infoStart">
+                <view class="step_name">{{step.operationType.name}}</view>
+                <view class="step_time">
+                  {{step.creatTime}}
+                </view>
+              </view>
+              <view class="step_icon pda pda-icon_liucheng active"></view>
+              <view class="step_infoEnd">
+                <view class="step_overtime">
+                  {{step.operationUserName}}
+                </view>
+              </view>
+            </view>
+          </block>
+        </view>
       </scroll-view>
     </view>
     <!-- 底部 -->
@@ -124,6 +142,7 @@
   import {
     reqFetchData,
     reqFetchWorkOrderLog,
+    reqFetchDataList,
   } from "../../request/api.js";
   import {
     mapState
@@ -143,6 +162,7 @@
   export default {
     data() {
       return {
+        logList: [], //过程信息列表
         debouncedChangeTab: null,
         // 路由传参
         queryParams: {},
@@ -171,10 +191,10 @@
                 id: 1,
                 name: '检查信息'
               },
-              {
-                id: 3,
-                name: '过程信息'
-              },
+              // {
+              //   id: 3,
+              //   name: '过程信息'
+              // },
             ];
             this.changeTab(1);
             break;
@@ -213,7 +233,7 @@
         }
         return timeStr;
       },
-      // 计算流程信息耗时
+      // 计算过程信息耗时
       filterTime(step) {
         let num = 0;
         step.forEach((e) => {
@@ -232,6 +252,7 @@
             this.getSpecimen(this.queryParams);
             break;
           case 3:
+            this.getSpecimenProcess(this.queryParams);
             break;
         }
       },
@@ -281,7 +302,7 @@
         reqFetchData('api', 'specimen', queryParams.id).then(res => {
           uni.hideLoading();
           if (res.status == 200) {
-            // 流程信息
+            // 过程信息
             this.info = res.data;
             //底部按钮处理
             this.btns = [{
@@ -308,6 +329,34 @@
           }
         })
       },
+      //获取标本过程信息数据
+      getSpecimenProcess(queryParams) {
+        console.log(queryParams);
+        uni.showLoading({
+          mask: true,
+          title: '加载中',
+        })
+        let postData = {
+          "idx": 0,
+          "sum": 999,
+          "specimenHistory": {
+            "scode": queryParams.scode
+          }
+        };
+        reqFetchDataList('api', 'specimenHistory', postData).then(res => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            // 过程信息
+            this.logList = res.list || [];
+          } else {
+            this.$refs.seiminModel.show({
+              skin: 'toast',
+              icon: 'error',
+              content: '请求失败',
+            })
+          }
+        })
+      },
     },
     onLoad(queryParams) {
       console.log(queryParams);
@@ -324,6 +373,7 @@
 
 <style lang="scss" scoped>
   .orderDetail {
+
     // 头部
     .orderDetail_header {
       position: fixed;
@@ -359,6 +409,7 @@
 
       .orderDetail_infoItem {
         width: 702rpx;
+        height: 80vh;
         background-color: #fff;
         margin-top: 8rpx;
         border-radius: 8rpx;
@@ -456,11 +507,12 @@
             }
           }
 
-          // 流程信息
+          // 过程信息
           .orderDetail_process_item {
             min-height: 120rpx;
             line-height: 50rpx;
             color: #333;
+            margin-bottom: 20rpx;
             @include flex(center);
 
             &:last-of-type {
@@ -473,8 +525,11 @@
 
             .step_infoStart {
               font-size: 28rpx;
-              flex: 1;
-              @include flex(flex-end);
+              text-align: center;
+              position: relative;
+              top: -50rpx;
+              width: 180rpx;
+              margin-left: 100rpx;
 
               .step_time {
                 margin-left: 16rpx;
@@ -498,7 +553,7 @@
                 top: 60rpx;
                 left: 18rpx;
                 width: 1px;
-                height: calc(100% - 70rpx);
+                height: calc(100% - 50rpx);
                 background-color: #DDE1E5;
               }
             }

pages/index/index.vue

@@ -105,7 +105,7 @@
   export default {
     data() {
       return {
-        placeholderStyle: "color:#999;font-size:30rpx;",
+        placeholderStyle: "color:#999;font-size:30rpx;line-height:66rpx;",
         urgentNum: 0, //急标数量
         ordinaryNum: 0, //普标数量
         newOrderList: [], //最新工单列表

pages/orderDetail/orderDetail.vue

@@ -2,14 +2,16 @@
   <view class="orderDetail">
     <!-- 头部 -->
     <view class="orderDetail_header">
-      <view class="orderDetail_header_item" v-for="tab in tabs" :key="tab.id" :class="{active:tab.id === selectedTab}"
-        @click="debouncedChangeTab(tab.id)">
-        {{tab.name}}
-      </view>
+      <block v-if="tabs.length">
+        <view class="orderDetail_header_item" v-for="tab in tabs" :key="tab.id" :class="{active:tab.id === selectedTab}"
+          @click="debouncedChangeTab(tab.id)">
+          {{tab.name}}
+        </view>
+      </block>
     </view>
     <!-- tab -->
     <!-- 工单信息 -->
-    <view class="orderDetail_info" v-show="selectedTab === 1">
+    <view class="orderDetail_info" v-if="selectedTab === 1">
       <scroll-view scroll-y class="orderDetail_infoItem" v-if="orderInfo.id">
         <view class="orderDetail_infoItem_header">
           <view class="orderDetail_infoItem_header_title">
@@ -36,13 +38,15 @@
           </view>
           <view class="orderDetail_infoItem_item_content">
             <text class="orderDetail_infoItem_item_name">申请科室</text>
-            <text
-              class="orderDetail_infoItem_item_value">{{orderInfo.createDeptDTO?(deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'暂无'}}</text>
+            <text class="orderDetail_infoItem_item_value"
+              v-if="orderInfo.createDeptDTO">{{deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept}}</text>
+            <text v-else>暂无</text>
           </view>
           <view class="orderDetail_infoItem_item_content">
             <text class="orderDetail_infoItem_item_name">起点科室</text>
-            <text
-              class="orderDetail_infoItem_item_value">{{orderInfo.startDept?(deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept):'暂无'}}</text>
+            <text class="orderDetail_infoItem_item_value"
+              v-if="orderInfo.startDept">{{deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept}}</text>
+            <text v-else>暂无</text>
           </view>
           <view class="orderDetail_infoItem_item_content"
             v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者其他服务业务']">
@@ -117,7 +121,7 @@
       </scroll-view>
     </view>
     <!-- 流程信息 -->
-    <view class="orderDetail_info" v-show="selectedTab === 2">
+    <view class="orderDetail_info" v-if="selectedTab === 2">
       <scroll-view scroll-y class="orderDetail_infoItem" v-if="logList.length">
         <view class="orderDetail_infoItem_header">
           <view class="orderDetail_infoItem_header_title">
@@ -128,31 +132,33 @@
           </view>
         </view>
         <view class="orderDetail_infoItem_item process">
-          <view class="orderDetail_process_item" v-for="(step,i) in logList" :key="i">
-            <view class="step_infoStart">
-              <view class="step_name">{{step.operationName}}</view>
-              <view class="step_time" v-if="step.record && step.record[0]">
-                {{step.record[0].operationTime|formatDate('MM-dd HH:mm')}}
-              </view>
-            </view>
-            <view class="step_icon pda pda-icon_liucheng"
-              :class="{'active':(step.record&&step.record[0]&&step.record[0].operationTime)}"></view>
-            <view class="step_infoEnd">
-              <view class="step_overtime" v-if="i!=0&&step.record&&step.record.length">
-                耗时{{filterTime(step.record)}}
+          <block v-if="logList.length">
+            <view class="orderDetail_process_item" v-for="(step,i) in logList" :key="i">
+              <view class="step_infoStart">
+                <view class="step_name">{{step.operationName}}</view>
+                <view class="step_time" v-if="step.record && step.record[0]">
+                  {{step.record[0].operationTime|formatDate('MM-dd HH:mm')}}
+                </view>
               </view>
-              <view class="step_dept" v-if="step.record&&step.record[0]&&step.record[0].dept">
-                <text v-for="(dept,index) in step.record"
-                  :key="index">{{dept?(deptDisplay == 2?dept.deptalias:dept.dept)+',':''}}</text>
+              <view class="step_icon pda pda-icon_liucheng"
+                :class="{'active':(step.record&&step.record[0]&&step.record[0].operationTime)}"></view>
+              <view class="step_infoEnd">
+                <view class="step_overtime" v-if="i!=0&&step.record&&step.record.length">
+                  耗时{{filterTime(step.record)}}
+                </view>
+                <view class="step_dept" v-if="step.record&&step.record.length&&step.record[0]&&step.record[0].dept">
+                  <text v-for="(dept,index) in step.record"
+                    :key="index">{{dept?(deptDisplay == 2?dept.deptalias:dept.dept)+',':''}}</text>
+                </view>
               </view>
             </view>
-          </view>
+          </block>
         </view>
       </scroll-view>
     </view>
     <!-- 业务信息 -->
-    <view class="orderDetail_info" v-show="selectedTab === 3">
-      <scroll-view scroll-y class="orderDetail_infoItem">
+    <view class="orderDetail_info" v-if="selectedTab === 3">
+      <scroll-view scroll-y class="orderDetail_infoItem" v-if="orderInfo.id">
         <view class="orderDetail_infoItem_header">
           <view class="orderDetail_infoItem_header_title">
             <view class="icon"></view>
@@ -195,7 +201,8 @@
             </view>
           </view>
           <!-- 检查信息 -->
-          <block v-if="orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['患者陪检业务']">
+          <block
+            v-if="orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['患者陪检业务']&&orderInfo.checkList.length">
             <view class="inspect_item" v-for="item in orderInfo.checkList" :key="item.id"
               @click="toDetail(item.id,'inspect')">
               <view class="inspect_item_name">
@@ -217,7 +224,7 @@
         </view>
         <!-- 标本信息 -->
         <view class="orderDetail_infoItem_item business business_specimen"
-          v-if="orderInfo.taskType&&(orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['临时标本业务'] || orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['标本轮巡业务'])">
+          v-show="orderInfo.taskType&&(orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['临时标本业务'] || orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['标本轮巡业务'])">
           <view class="inspect_specimen">
             <uni-table stripe emptyText="暂无更多数据">
               <!-- 表头行 -->
@@ -228,27 +235,30 @@
                 <uni-th align="center" width="71">科室</uni-th>
               </uni-tr>
               <!-- 表格数据行 -->
-              <uni-tr v-for="data in orderInfo.specimenSet" :key="data.id" @click.native="toDetail(data.id,'specimen')">
-                <uni-td align="center">{{data.stype?data.stype.name:'暂无'}}</uni-td>
-                <uni-td align="center">{{data.scode || '暂无'}}</uni-td>
-                <uni-td align="center">{{data.speState?data.speState.name:'暂无'}}</uni-td>
-                <uni-td align="center" class="td" v-if="data.checkDept">
-                  {{deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept}}
-                  <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
-                  </image>
-                </uni-td>
-                <uni-td align="center" class="td" v-else>
-                  暂无
-                  <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
-                  </image>
-                </uni-td>
-              </uni-tr>
+              <block v-if="orderInfo.specimenSet.length">
+                <uni-tr v-for="data in orderInfo.specimenSet" :key="data.id"
+                  @click.native="toDetail(data.id,'specimen',data.scode)">
+                  <uni-td align="center">{{data.stype?data.stype.name:'暂无'}}</uni-td>
+                  <uni-td align="center">{{data.scode || '暂无'}}</uni-td>
+                  <uni-td align="center">{{data.speState?data.speState.name:'暂无'}}</uni-td>
+                  <uni-td align="center" class="td" v-if="data.checkDept">
+                    {{deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept}}
+                    <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
+                    </image>
+                  </uni-td>
+                  <uni-td align="center" class="td" v-else>
+                    暂无
+                    <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
+                    </image>
+                  </uni-td>
+                </uni-tr>
+              </block>
             </uni-table>
           </view>
         </view>
         <!-- 药品信息 -->
         <view class="orderDetail_infoItem_item business business_drugsBag"
-          v-if="orderInfo.taskType&&(orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['药品配送业务'] || orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['静配配送'])">
+          v-show="orderInfo.taskType&&(orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['药品配送业务'] || orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['静配配送'])">
           <!-- 检查信息 -->
           <block v-if="orderInfo.drugs&&orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['药品配送业务']">
             <view class="drugsBag_item">
@@ -375,10 +385,16 @@
         this.changeTab(1);
       },
       // 跳转详情
-      toDetail(id, associationType) {
-        uni.navigateTo({
-          url: `/pages/detail/detail?id=${id}&associationType=${associationType}`
-        })
+      toDetail(id, associationType,scode) {
+        if(scode){
+          uni.navigateTo({
+            url: `/pages/detail/detail?id=${id}&associationType=${associationType}&scode=${scode}`
+          })
+        }else{
+          uni.navigateTo({
+            url: `/pages/detail/detail?id=${id}&associationType=${associationType}`
+          })
+        }
       },
       // 格式化时分秒
       // （时间小于一分钟则显示秒，时间大于一分钟则显示分钟数，如超出一小时则显示小时和分钟。）time单位:秒
@@ -443,7 +459,9 @@
               return this.deptDisplay == 2 ? v.deptalias : v.dept;
             }).toString();
             // 工单信息
-            this.orderInfo = res.data;
+            res.data.checkList = res.data.checkList || [];
+            res.data.specimenSet = res.data.specimenSet || [];
+            this.orderInfo = res.data || {};
             //底部按钮处理
             let btns = [{
               name: "回到列表",
@@ -521,6 +539,7 @@
                   name: "加急",
                   type: "primary",
                   click: () => {
+                    console.log(newOrder)
                     showJiaji.call(this, newOrder.id, () => {
                       this.$refs.seiminModel.close();
                       uni.navigateTo({
@@ -561,7 +580,7 @@
           uni.hideLoading();
           if (res.status == 200) {
             // 流程信息
-            this.logList = res.data;
+            this.logList = res.data || [];
           } else {
             this.$refs.seiminModel.show({
               skin: 'toast',
@@ -624,6 +643,7 @@
 
       .orderDetail_infoItem {
         width: 702rpx;
+        height: 80vh;
         background-color: #fff;
         margin-top: 8rpx;
         border-radius: 8rpx;
@@ -896,6 +916,7 @@
             ::v-deep .uni-table-td {
               word-break: break-all;
             }
+
           }
 
           // 业务信息-药品

pages/orderList/orderList.vue

@@ -145,7 +145,6 @@
         pageNum: 20, //每页的工单数量
         pickerList: [], //picker列表
         type: '', //打开picker的类型，工单状态||关联类型
-        checkStatus: {}, //审核状态列表
       };
     },
     computed: {
@@ -233,13 +232,11 @@
         Promise.all([
           this.queryWorkOrdersRequest(), //查询最新工单列表
           this.queryDictionary('association_types'), //获取数据字典-关联类型
-          this.queryDictionary('check_status'), //获取数据字典-审核状态
         ]).then((values) => {
           uni.hideLoading();
           uni.stopPullDownRefresh();
           this.queryWorkOrdersResponse(values[0]);
           this.queryDictionaryResponse(values[1], 'association_types');
-          this.queryDictionaryResponse(values[2], 'check_status');
         });
       },
       // 查询最新工单列表（上拉）
@@ -353,7 +350,6 @@
       },
       // 获取数据字典
       queryDictionaryResponse(res, type) {
-        let obj = {};
         let arr = [];
         switch (type) {
           case 'association_types':
@@ -366,13 +362,6 @@
               value: -1
             }, ...arr];
             break;
-          case 'check_status':
-            obj = {};
-            res.forEach(v => {
-              obj[v.value] = v.id;
-            })
-            this.checkStatus = obj;
-            break;
         }
       },
     },

pages/patientBuild/patientBuild.vue

@@ -212,7 +212,7 @@
         // 提示文字
         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) : []; // 检查
+        let checks = this.patientBuildData.checks ? cloneDeep(this.patientBuildData.checks) : []; // 检查
         this.goods = goods;
         // 患者陪检业务和患者其他服务业务相关处理
         this.hasYYtimeChecks = checks.filter((v) => Boolean(v.yyTime));
@@ -226,6 +226,7 @@
           this.urgentRemark = '';
         }
         //判断预约建单按钮
+        console.log(this.patientBuildTrip)
         if (this.hasYYtimeChecks.length && this.patientTaskType.appointmentSwitch == 1) {
           //选中的检查数组都有预约时间并且允许预约建单
           this.isYYBuild = true;
@@ -237,7 +238,7 @@
           this.yyInspectChange();
         } else {
           //不允许预约建单
-          this.isYYBuild = true;
+          this.isYYBuild = false;
           this.date = false;
           this.time = false;
           this.timestamp = new Date().getTime();

pages/patientBuildConfirm/patientBuildConfirm.vue

@@ -135,11 +135,15 @@
                     this.$refs.seiminModel.show({
                       skin: "toast",
                       icon: "success",
-                      content: "创建成功",
+                      content: "您申请的工单已建单成功，工作人员会尽快处理！",
+                      btns:[{
+                        click:()=>{
+                          uni.navigateTo({
+                            url: '/pages/patientList/patientList'
+                          })
+                        }
+                      }]
                     });
-                    uni.navigateTo({
-                      url: '/pages/orderList/orderList'
-                    })
                   } else {
                     this.$refs.seiminModel.show({
                       skin: "toast",
@@ -185,6 +189,7 @@
             },
           }, {
             name: "取消",
+            flex: 1,
             type: "default",
             click: () => {
               this.$refs.seiminModel.close();
@@ -238,11 +243,15 @@
               this.$refs.seiminModel.show({
                 skin: "toast",
                 icon: "success",
-                content: "创建成功",
+                content: "您申请的工单已建单成功，工作人员会尽快处理！",
+                btns:[{
+                  click:()=>{
+                    uni.navigateTo({
+                      url: '/pages/patientList/patientList'
+                    })
+                  }
+                }]
               });
-              uni.navigateTo({
-                url: '/pages/orderList/orderList'
-              })
             } else if (data.status == 1000033) {
               //重复建单那策略
               this.showReaptModal(data.msg, postData);
@@ -391,6 +400,7 @@
 
       .orderDetail_infoItem {
         width: 702rpx;
+        height: 80vh;
         background-color: #fff;
         margin-top: 8rpx;
         border-radius: 8rpx;

pages/patientDetail/patientDetail.vue

@@ -59,7 +59,7 @@
                 <uni-th align="center" width="71">科室</uni-th>
               </uni-tr>
               <!-- 表格数据行 -->
-              <uni-tr v-for="data in info.specimens" :key="data.id" @click.native="toDetail(data.id,'specimen')">
+              <uni-tr v-for="data in info.specimens" :key="data.id" @click.native="toDetail(data.id,'specimen',data.scode)">
                 <uni-td align="center">{{data.stype?data.stype.name:'暂无'}}</uni-td>
                 <uni-td align="center">{{data.scode || '暂无'}}</uni-td>
                 <uni-td align="center">{{data.speState?data.speState.name:'暂无'}}</uni-td>
@@ -121,6 +121,10 @@
     <!-- 底部 -->
     <seiminFooterBtn :btns="btns"></seiminFooterBtn>
     <seiminModel ref="seiminModel"></seiminModel>
+    <seiminPicker ref="sPicker" :title="pickerTitle" titleColor="#808080" titleFontSize="28rpx" confirmColor="#333"
+      confirmFontSize="38rpx" confirmFontWeight="500" itemFontSize="32rpx" @onClose="closePicker"
+      @onConfirm="confirmPicker" :pickerList="taskTypeList">
+    </seiminPicker>
   </view>
 </template>
 
@@ -130,9 +134,12 @@
   } from 'lodash/function';
   import {
     reqGetPatientInspectInfo,
+    reqDeptTSPTaskType,
+    reqBuildTrip,
   } from "../../request/api.js";
   import {
-    mapState
+    mapState,
+    mapMutations,
   } from "vuex";
   import {
     GDSTATE
@@ -149,6 +156,10 @@
   export default {
     data() {
       return {
+        checkedShowMsg: {}, //当前选中的任务类型的buildtrip信息
+        pickerTitle: "", //一键建单picker的title
+        taskTypeListResource: [], //任务类型列表(请求的原始数据)
+        taskTypeList: [], //任务类型列表
         debouncedChangeTab: null,
         // 路由传参
         queryParams: {},
@@ -187,7 +198,7 @@
           name: "一键建单",
           type: "default",
           click: () => {
-            // wocao
+            this.buildOrder(this.queryParams);
           },
         }],
       };
@@ -196,15 +207,163 @@
       ...mapState('other', ["deptDisplay"]),
     },
     methods: {
+      ...mapMutations('other', ['changeQucikCreateOrderType', 'clearPatientBuildData', 'changePatientBuildData']),
+      //关闭
+      closePicker() {
+        this.$refs.sPicker._close();
+      },
+      //打开
+      openPicker() {
+        this.$refs.sPicker._open();
+      },
+      //确定：接收子组件传来的参数
+      confirmPicker(checkedObj) {
+        console.log(checkedObj);
+        // 补充：清除建单数据
+        this.clearPatientBuildData();
+        // 2,获取buildTrip信息
+        let postData = {
+          "taskTypeId": checkedObj.value,
+          "patientCode": this.selectedPatient.patientCode
+        };
+        uni.showLoading({
+          mask: true,
+          title: '加载中'
+        })
+        reqBuildTrip(postData).then(res => {
+          uni.hideLoading();
+          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.changePatientBuildData({
+                  key: 'dept',
+                  value: {
+                    startDept: res.start.start.list[0],
+                    endDept: res.end.end.list[0],
+                  }
+                });
+                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.changePatientBuildData({
+                key: 'dept',
+                value: {
+                  startDept: {
+                    id: res.startDept,
+                    dept: res.startDeptName,
+                    deptalias: res.startDeptAlias
+                  }, //待改
+                  endDept: {
+                    id: res.startDept,
+                    dept: res.startDeptName,
+                    deptalias: res.startDeptAlias
+                  }, //待改
+                }
+              });
+              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 || '获取数据失败');
+            }
+          }
+        })
+      },
+      // 一键建单
+      buildOrder(patient) {
+        this.selectedPatient = patient;
+        // 1,请求任务类型列表
+        uni.showLoading({
+          mask: true,
+          title: '加载中'
+        })
+        reqDeptTSPTaskType().then(res => {
+          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,
+            }));
+            this.pickerTitle = `您选择了<b class="green">${patient.patientName}</b>患者，请选择下方具体服务项`;
+            this.openPicker();
+          } else {
+            this.$refs.seiminModel.show({
+              skin: "toast",
+              icon: "error",
+              content: res.msg || "获取数据失败",
+            });
+            throw new Error(res.msg || "获取数据失败");
+          }
+        })
+      },
       init(queryParams) {
+        console.log(queryParams)
         this.queryParams = queryParams;
         this.changeTab(1);
       },
       // 跳转详情
-      toDetail(id, associationType) {
-        uni.navigateTo({
-          url: `/pages/detail/detail?id=${id}&associationType=${associationType}`
-        })
+      toDetail(id, associationType,scode) {
+        if(scode){
+          uni.navigateTo({
+            url: `/pages/detail/detail?id=${id}&associationType=${associationType}&scode=${scode}`
+          })
+        }else{
+          uni.navigateTo({
+            url: `/pages/detail/detail?id=${id}&associationType=${associationType}`
+          })
+        }
       },
       // 切换tab
       changeTab(id) {
@@ -298,6 +457,7 @@
 
       .orderDetail_infoItem {
         width: 702rpx;
+        height: 80vh;
         background-color: #fff;
         margin-top: 8rpx;
         border-radius: 8rpx;

pages/patientList/patientList.vue

@@ -30,7 +30,7 @@
             <text class="orderList_listItem_item_time">待检{{patient.watingCount}}</text>
           </view>
           <view class="orderList_listItem_item_btns">
-            <button type="primary" class="btn" @click.stop="toDetail(patient.patientCode)">患者详情</button>
+            <button type="primary" class="btn" @click.stop="toDetail(patient.patientCode,patient.patientName)">患者详情</button>
             <button type="primary" class="btn" @click.stop="buildOrder(patient)">一键建单</button>
           </view>
         </view>
@@ -224,9 +224,9 @@
         })
       },
       // 跳转患者详情
-      toDetail(patientCode) {
+      toDetail(patientCode,patientName) {
         uni.navigateTo({
-          url: `/pages/patientDetail/patientDetail?patientCode=${patientCode}`
+          url: `/pages/patientDetail/patientDetail?patientCode=${patientCode}&patientName=${patientName}`
         })
       },
       //监听输入

pages/personalCenter/personalCenter.vue

@@ -146,6 +146,7 @@
 
       .orderDetail_infoItem {
         width: 702rpx;
+        height: 30vh;
         background-color: #fff;
         border-radius: 8rpx;
         position: relative;

pages/quickCreateOrder/quickCreateOrder.vue

@@ -192,6 +192,8 @@
           this.remarksFocus = true;
         });
         this.workOrderRemark += customRemark;
+        console.log(this.workOrderRemark.replace(/\s/g,''))
+        this.workOrderRemark = this.workOrderRemark.replace(/\s/g,'').slice(0,100);
       },
       //获取所有数据
       getData(qucikCreateOrderType, qucikCreateOrderTypeId) {

pages/specimenList/specimenList.vue

@@ -19,21 +19,23 @@
             <uni-th align="center" width="71">科室</uni-th>
           </uni-tr>
           <!-- 表格数据行 -->
-          <uni-tr v-for="data in speList" :key="data.id" @click.native="toDetail(data.id,'specimen')">
-            <uni-td align="center">{{data.stype?data.stype.name:'暂无'}}</uni-td>
-            <uni-td align="center">{{data.scode || '暂无'}}</uni-td>
-            <uni-td align="center">{{data.speState?data.speState.name:'暂无'}}</uni-td>
-            <uni-td align="center" class="td" v-if="data.checkDept">
-              {{deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept}}
-              <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
-              </image>
-            </uni-td>
-            <uni-td align="center" class="td" v-else>
-              暂无
-              <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
-              </image>
-            </uni-td>
-          </uni-tr>
+          <block v-for="data in speList" :key="data.id">
+            <uni-tr @click.native="toDetail(data.id,'specimen',data.scode)">
+              <uni-td align="center">{{data.stype?data.stype.name:'暂无'}}</uni-td>
+              <uni-td align="center">{{data.scode || '暂无'}}</uni-td>
+              <uni-td align="center">{{data.speState?data.speState.name:'暂无'}}</uni-td>
+              <uni-td align="center" class="td" v-if="data.checkDept">
+                {{deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept}}
+                <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
+                </image>
+              </uni-td>
+              <uni-td align="center" class="td" v-else>
+                暂无
+                <image class="urgent" v-if="data.urgent == 1" src="../../static/imgs/icon_ji.png" mode="widthFix">
+                </image>
+              </uni-td>
+            </uni-tr>
+          </block>
         </uni-table>
       </view>
     </view>
@@ -88,9 +90,9 @@
     },
     methods: {
       // 跳转详情
-      toDetail(id, associationType) {
+      toDetail(id, associationType, scode) {
         uni.navigateTo({
-          url: `/pages/detail/detail?id=${id}&associationType=${associationType}`
+          url: `/pages/detail/detail?id=${id}&associationType=${associationType}&scode=${scode}`
         })
       },
       // 查询最新工单列表
@@ -111,8 +113,8 @@
       // 查询最新工单列表
       queryWorkOrdersResponse(res, idxPlus = false) {
         if (res.status == 200) {
-          res.data = res.data || [];
-          let speList = res.data;
+          let speList = res.data || [];
+          console.log(speList, idxPlus)
           if (idxPlus) {
             //累加
             this.speList = this.speList.concat(speList);
@@ -177,9 +179,11 @@
         this.init();
       },
     },
+    mounted() {
+      this.init();
+    },
     onLoad(querParams) {
       this.selectedSpeState = querParams.urgent == 1 ? '急查' : '普查';
-      this.init();
     },
     onPullDownRefresh() {
       this.init();

request/config.js

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

uni_modules/uni-table/components/uni-th/uni-th.vue

@@ -14,7 +14,7 @@
 	</th>
 	<!-- #endif -->
 	<!-- #ifndef H5 -->
-	<view class="uni-table-th" :class="{ 'table--border': border }" :style="{ width: customWidth + 'px', 'text-align': align }"><slot></slot></view>
+	<view class="uni-table-th" :class="{ 'table--border': border }" :style="{ width: customWidth + 'px', 'text-align': align, 'color': '#fff' }"><slot></slot></view>
 	<!-- #endif -->
 </template>
 

utils/index.js

@@ -253,7 +253,7 @@ export function showJiaji(id, callBack) {
             urgentDetails: {
               workerOrder: id,
               checkStatus: {
-                id: this.checkStatus[1]
+                id: 330
               },
               urgentReason: urgentTextArea,
             },