其他服务类型建单页面

components/seiminModel/seiminModel.vue

@@ -247,14 +247,6 @@
               }
             }
           }
-
-          .red {
-            color: $textColorRed;
-          }
-
-          .green {
-            color: $defaultColor;
-          }
         }
 
         .seiminModel_footer {

pages/index/index.vue

@@ -55,7 +55,7 @@
         </view>
         <view class="quick_other_container">
           <view class="quick_other_container_item" v-for="quickOther in quickOtherList" :key="quickOther.id">
-            <view class="quick_other_container_item_text">
+            <view class="quick_other_container_item_text" @click="quickOrderOther(quickOther)">
               {{quickOther.taskName}}
             </view>
           </view>
@@ -263,6 +263,16 @@
           taskTypeId: this.specimenTaskTypeId
         });
       },
+      //其他临床服务快捷建单
+      quickOrderOther(quickOther){
+        uni.navigateTo({
+          url: '/pages/quickCreateOrder/quickCreateOrder'
+        })
+        this.changeQucikCreateOrderType({
+          type: 'other',
+          taskTypeId: quickOther.id
+        });
+      },
       // 切换科室弹窗
       showDeptModel() {
         const {

pages/quickCreateOrder/quickCreateOrder.vue

@@ -2,15 +2,33 @@
   <view class="quickCreateOrder">
     <view class="qco_msg" v-html="dataObj.msg"></view>
     <!-- 起点科室,终点科室 -->
-    <block v-if="qucikCreateOrderType === 'other'">
+    <block v-if="qucikCreateOrderType === 'other' && (dataObj.start || dataObj.end)">
+      <!-- 返回值的departmentStrategy是201 则是默认发起科室 -->
+      <!-- 返回值的departmentStrategy是202 则是固定科室范围 -->
+      <!-- 返回值的departmentStrategy是203 则是固定科室 -->
+      <!-- 返回值的departmentStrategy是204 则是自主填写 -->
+      <!-- 返回值的departmentStrategy是205 则是固定科室类型 -->
+      <!-- 100013 （护士端一键建单展示策略）取起点科室，和msg值展示 -->
+      <!-- <block v-if="dataObj.status == 100013"> -->
       <view class="select_block">
-        <text class="select_label">起点科室</text>
-        <view class="select_placeholder">请选择起点科室<text class="pda pda-xiangyou"></text></view>
+        <text class="select_label"
+          :class="{disableColor:(dataObj.start.start.departmentStrategy == 201 ||dataObj.start.start.departmentStrategy == 203)}">起点科室</text>
+        <view class="select_placeholder"
+          v-if="dataObj.start.start.departmentStrategy == 201||dataObj.start.start.departmentStrategy == 203">
+          {{deptDisplay == 1?dataObj.start.start.list[0].dept:dataObj.start.start.list[0].deptalias}}
+        </view>
+        <view class="select_placeholder" v-else>请选择起点科室<text class="pda pda-xiangyou"></text></view>
       </view>
       <view class="select_block">
-        <text class="select_label">终点科室</text>
-        <view class="select_placeholder">请选择终点科室<text class="pda pda-xiangyou"></text></view>
+        <text class="select_label"
+          :class="{disableColor:(dataObj.end.end.departmentStrategy == 201||dataObj.end.end.departmentStrategy == 203)}">终点科室</text>
+        <view class="select_placeholder"
+          v-if="(dataObj.end.end.departmentStrategy == 201||dataObj.end.end.departmentStrategy == 203)">
+          {{deptDisplay == 1?dataObj.end.end.list[0].dept:dataObj.end.end.list[0].deptalias}}
+        </view>
+        <view class="select_placeholder" v-else>请选择终点科室<text class="pda pda-xiangyou"></text></view>
       </view>
+      <!-- </block> -->
     </block>
     <!-- 备注 -->
     <view class="remarks" v-if="dataObj.remarksSwitch == 1">
@@ -30,7 +48,7 @@
         </view>
       </view>
     </view>
-    <view class="quickAndHistory" v-if="dataObj.remarksSwitch == 1">
+    <view class="quickAndHistory" v-if="dataObj.remarksSwitch == 1 && historyCustomRemarks.length">
       <view class="quickAndHistory_header">
         历史输入
       </view>
@@ -91,7 +109,7 @@
       };
     },
     computed: {
-      ...mapState(['qucikCreateOrderType', 'qucikCreateOrderTypeId']),
+      ...mapState(['qucikCreateOrderType', 'qucikCreateOrderTypeId', 'deptDisplay']),
       ...mapState('user', ['loginInfoUserDeptId']),
     },
     methods: {
@@ -108,30 +126,47 @@
         uni.showLoading({
           title: '加载中'
         });
-        let postData = {
+        let postData1 = {};
+        let postData2 = {
           "taskTypeId": qucikCreateOrderTypeId,
           "deptId": this.loginInfoUserDeptId,
         };
         if (qucikCreateOrderType === 'specimen') {
-          Promise.all([
-            reqBuildTrip(postData),
-            reqRecentRemarks(postData)
-          ]).then(values => {
-            uni.hideLoading();
-            this.getBuildTrip(values[0]);
-            this.getRecentRemarks(values[1]);
-          })
+          //标本快捷建单
+          postData1 = {
+            "taskTypeId": qucikCreateOrderTypeId,
+            "deptId": this.loginInfoUserDeptId,
+          };
+        } else if (qucikCreateOrderType === 'other') {
+          //其他临床服务快捷建单
+          postData1 = {
+            "taskTypeId": qucikCreateOrderTypeId,
+          };
         }
+        Promise.all([
+          reqBuildTrip(postData1),
+          reqRecentRemarks(postData2)
+        ]).then(values => {
+          uni.hideLoading();
+          this.getBuildTrip(values[0]);
+          this.getRecentRemarks(values[1]);
+        })
       },
-      // 获取其他数据
+      // 获取数据(除历史输入)
       getBuildTrip(res) {
-        if (res.status == 200) {
+        if (res.status == 200 || res.status == 100012 || res.status == 100013 || res.status == 100014 || res.status ==
+          100015) {
           // 处理返回的数据
           if (res.customRemarks) {
             res.customRemarks = res.customRemarks.split('$');
           } else {
             res.customRemarks = []
           }
+          // 处理msg
+          if (res.msg.includes('<b>')) {
+            res.msg = res.msg.replace(/<b>/g, '<text class="green">');
+            res.msg = res.msg.replace(/<\/b>/g, '</text>');
+          }
           this.dataObj = res;
         }
       },
@@ -143,24 +178,60 @@
       },
       // 提交数据,建单
       submitData() {
+        let postData = {};
         uni.showLoading({
           title: '加载中',
           mask: true
         })
-        let postData = {
-          urgent: 0,
-          workOrder: {
-            sourceId: SOURCEID['护士端'],
-            workOrderRemark: this.workOrderRemark,
-            taskType: {
-              id: this.qucikCreateOrderTypeId
+        if (this.qucikCreateOrderType === 'specimen') {
+          //标本建单
+          postData = {
+            urgent: 0,
+            workOrder: {
+              sourceId: SOURCEID['护士端'],
+              workOrderRemark: this.workOrderRemark,
+              taskType: {
+                id: this.qucikCreateOrderTypeId
+              },
+              createDept: this.loginInfoUserDeptId,
+              startDept: {
+                id: this.loginInfoUserDeptId
+              },
             },
-            createDept: this.loginInfoUserDeptId,
-            startDept: {
-              id: this.loginInfoUserDeptId
+          };
+        } else if (this.qucikCreateOrderType === 'other') {
+          let startDept = {}; //起点科室
+          let endDepts = []; //终点科室
+          // 其他服务建单
+          // 起点科室---- start
+          if (this.dataObj.start.start.departmentStrategy == 201) {
+            startDept = {
+              id: this.dataObj.start.start.list[0].id
+            };
+          }
+          // 起点科室---- end
+          // 终点科室---- start
+          if (this.dataObj.start.start.departmentStrategy == 201) {
+            endDepts = [{
+              id: this.dataObj.end.end.list[0].id
+            }];
+          }
+          // 终点科室---- end
+          //请求参数
+          postData = {
+            workOrder: {
+              sourceId: SOURCEID['护士端'],
+              workOrderRemark: this.workOrderRemark,
+              taskType: {
+                id: this.qucikCreateOrderTypeId
+              },
+              createDept: this.loginInfoUserDeptId,
+              startDept,
+              endDepts,
             },
-          },
-        };
+          };
+        }
+
         reqBuildOrder(postData).then(res => {
           uni.hideLoading();
           if (res.status == 200) {
@@ -189,6 +260,7 @@
       }
     },
     onLoad() {
+      console.log(this.qucikCreateOrderType, this.qucikCreateOrderTypeId);
       this.getData(this.qucikCreateOrderType, this.qucikCreateOrderTypeId);
     }
   }
@@ -205,11 +277,6 @@
       line-height: 40rpx;
       font-size: 28rpx;
       text-align: center;
-
-      b {
-        color: $defaultColor;
-        font-weight: normal;
-      }
     }
 
     // 起点科室,终点科室
@@ -223,6 +290,10 @@
 
       .select_label {
         color: #000;
+
+        &.disableColor {
+          color: #999;
+        }
       }
 
       .select_placeholder {