增加版本号-患者建单选择科室

main.js

@@ -12,6 +12,7 @@ import {
 Vue.prototype.$request = request
 
 Vue.config.productionTip = false
+console.info('v2.4.1')
 
 App.mpType = 'app'
 

pages/patientList/patientList.vue

@@ -100,14 +100,9 @@
         })
         reqBuildTrip(postData).then(res => {
           uni.hideLoading();
-          if (res.status == 200) {
-            this.checkedShowMsg = res.data;
-            this.changeQucikCreateOrderType({
-              type: "patient",
-              taskTypeId: checkedObj.value,
-              patientBuildTrip: res,
-            });
-          } else if (res.status == 100015) {
+          let taskType = this.taskTypeList.find(v => v.value == checkedObj.value);
+          let patientTaskTypeName = taskType ? taskType.label : '';
+          if (res.status == 100015) {
             this.checkedShowMsg = res.data;
             //需要选择起点科室和目标科室
             uni.navigateTo({
@@ -116,6 +111,7 @@
             this.changeQucikCreateOrderType({
               type: "patient",
               taskTypeId: checkedObj.value,
+              patientTaskTypeName,
               patientBuildTrip: res,
             });
           } else if (res.status == 100013) {
@@ -127,6 +123,7 @@
             this.changeQucikCreateOrderType({
               type: "patient",
               taskTypeId: checkedObj.value,
+              patientTaskTypeName,
               patientBuildTrip: res,
             });
           } else if (res.status == 100014) {
@@ -138,15 +135,18 @@
             this.changeQucikCreateOrderType({
               type: "patient",
               taskTypeId: checkedObj.value,
+              patientTaskTypeName,
               patientBuildTrip: res,
             });
           } else {
-            this.$refs.seiminModel.show({
-              skin: "toast",
-              icon: "error",
-              content: res.msg || "获取数据失败",
+            //无需选择科室
+            this.checkedShowMsg = res.data;
+            this.changeQucikCreateOrderType({
+              type: "patient",
+              taskTypeId: checkedObj.value,
+              patientTaskTypeName,
+              patientBuildTrip: res,
             });
-            throw new Error(res.msg || "获取数据失败");
           }
         })
       },

pages/quickCreateOrder/quickCreateOrder.vue

@@ -11,8 +11,8 @@
       <!-- 返回值的departmentStrategy是204 则是自主填写 -->
       <!-- 返回值的departmentStrategy是205 则是固定科室类型 -->
       <!-- 100013 （护士端一键建单展示策略）取起点科室，和msg值展示 -->
-      <!-- <block v-if="dataObj.status == 100013"> -->
-      <view class="select_block" @click="selectDept('start')">
+      <view class="select_block" @click="selectDept('start')"
+        v-if="qucikCreateOrderType !== 'patient'||(qucikCreateOrderType === 'patient'&&!(dataObj.start.start.departmentStrategy == 201 || dataObj.start.start.departmentStrategy == 203))">
         <!-- 默认科室和固定科室 -->
         <text class="select_label"
           :class="{disableColor:dataObj.start.start.departmentStrategy == 201 || dataObj.start.start.departmentStrategy == 203}">起点科室</text>
@@ -26,7 +26,8 @@
           <text class="pda pda-xiangyou"></text>
         </view>
       </view>
-      <view class="select_block" @click="selectDept('end')">
+      <view class="select_block" @click="selectDept('end')"
+        v-if="qucikCreateOrderType !== 'patient'||(qucikCreateOrderType === 'patient'&&!(dataObj.end.end.departmentStrategy == 201 || dataObj.end.end.departmentStrategy == 203))">
         <!-- 默认科室和固定科室 -->
         <text class="select_label"
           :class="{disableColor:dataObj.end.end.departmentStrategy == 201 || dataObj.end.end.departmentStrategy == 203}">终点科室</text>
@@ -40,7 +41,6 @@
           <text class="pda pda-xiangyou"></text>
         </view>
       </view>
-      <!-- </block> -->
     </block>
     <!-- 备注 -->
     <view class="remarks" v-if="dataObj.remarksSwitch == 1">
@@ -79,6 +79,7 @@
 </template>
 
 <script>
+  import cloneDeep from 'lodash/cloneDeep';
   import {
     mapState,
     mapMutations
@@ -95,7 +96,7 @@
     data() {
       return {
         //患者建单信息展示
-        patientMsg: '您选择类型为<b class="green">转科</b>，需要填写科室，选择完成后点击下一步',
+        patientMsg: '',
         // 传递过来的参数
         queryParams: {},
         // 选择的起点科室
@@ -117,23 +118,7 @@
         // 历史输入
         historyCustomRemarks: [],
         //底部按钮
-        btns: [{
-            name: "回到首页",
-            type: "default",
-            click: () => {
-              uni.navigateTo({
-                url: "/pages/index/index",
-              });
-            },
-          },
-          {
-            name: "确认",
-            type: "primary",
-            click: () => {
-              this.submitData();
-            },
-          },
-        ],
+        btns: [],
       };
     },
     computed: {
@@ -144,8 +129,54 @@
         "deptDisplay",
         'searchDeptParams',
         'searchDeptResultList',
-        'patientBuildTrip'
+        'patientBuildTrip',
+        'patientTaskTypeName'
       ]),
+      isWriteDept() {
+        return {
+          startDept: this.startDept,
+          endDept: this.endDept
+        }
+      }
+    },
+    watch: {
+      isWriteDept(newVal) {
+        console.log(newVal);
+        if (this.qucikCreateOrderType !== 'patient') {
+          return;
+        }
+        if (newVal.startDept.id && newVal.endDept.id) {
+          this.btns = [{
+              name: "返回列表",
+              type: "default",
+              click: () => {
+                uni.navigateTo({
+                  url:'/pages/patientList/patientList'
+                })
+              },
+            },
+            {
+              name: "下一步",
+              type: "primary",
+              click: () => {
+                uni.navigateTo({
+                  url: "/pages/index/index",
+                });
+              },
+            },
+          ];
+        } else {
+          this.btns = [{
+            name: "返回列表",
+            type: "default",
+            click: () => {
+              uni.navigateTo({
+                url:'/pages/patientList/patientList'
+              })
+            },
+          }, ];
+        }
+      }
     },
     methods: {
       ...mapMutations('other', ['changeSearchDeptParams', 'changeSearchDeptResultList']),
@@ -194,6 +225,7 @@
       },
       // 获取数据(除历史输入)
       getBuildTrip(res) {
+        res = cloneDeep(res);
         if (
           res.status == 200 ||
           res.status == 100012 ||
@@ -213,13 +245,28 @@
             res.msg = res.msg.replace(/<b>/g, '<text class="green">');
             res.msg = res.msg.replace(/<\/b>/g, "</text>");
           }
-          if (res.start || res.end) {
+          if (res.start) {
             //其他服务建单
             if (
               res.start.start.departmentStrategy == 201 ||
               res.start.start.departmentStrategy == 203) {
               this.startDept = res.start.start.list[0];
             }
+
+            if (
+              res.start.start.departmentStrategy == 202 ||
+              res.start.start.departmentStrategy == 204 ||
+              res.start.start.departmentStrategy == 205
+            ) {
+              if (this.queryParams.isShow) {
+                this.startDept = this.searchDeptResultList.start || {};
+              } else {
+                this.changeSearchDeptResultList({});
+              }
+            }
+          }
+          if (res.end) {
+            //其他服务建单
             if (
               res.end.end.departmentStrategy == 201 ||
               res.end.end.departmentStrategy == 203) {
@@ -227,13 +274,11 @@
             }
 
             if (
-              res.start.start.departmentStrategy == 204 ||
-              res.start.start.departmentStrategy == 205 ||
+              res.end.end.departmentStrategy == 202 ||
               res.end.end.departmentStrategy == 204 ||
               res.end.end.departmentStrategy == 205
             ) {
               if (this.queryParams.isShow) {
-                this.startDept = this.searchDeptResultList.start || {};
                 this.endDept = this.searchDeptResultList.end || {};
               } else {
                 this.changeSearchDeptResultList({});
@@ -370,6 +415,14 @@
           dept: checkedObj.label,
           deptalias: checkedObj.labelAlias
         };
+        // 防止后选择不回显
+        let searchDeptResultList = this.searchDeptResultList;
+        searchDeptResultList[this.selectdDeptType] = {
+          id: checkedObj.value,
+          dept: checkedObj.label,
+          deptalias: checkedObj.labelAlias
+        }
+        this.changeSearchDeptResultList(searchDeptResultList);
       },
       // 选择起点科室
       selectDept(type) {
@@ -383,8 +436,8 @@
         }
         if (
           (this.dataObj.end.end.departmentStrategy == 201 ||
-            this.dataObj.end.end.departmentStrategy == 203 &&
-            type === 'end')) {
+            this.dataObj.end.end.departmentStrategy == 203) &&
+          type === 'end') {
           //默认科室和固定科室不能选科室
           return;
         }
@@ -419,9 +472,38 @@
       }
     },
     onLoad(queryParams) {
+      this.patientMsg = `您选择类型为<b class="green">${this.patientTaskTypeName}</b>，需要填写科室，选择完成后点击下一步`;
       this.queryParams = queryParams;
-      console.log(queryParams);
-      console.log(this.qucikCreateOrderType, this.qucikCreateOrderTypeId);
+      if (this.qucikCreateOrderType === 'patient') {
+        //患者建单选科室
+        this.btns = [{
+          name: "返回列表",
+          type: "default",
+          click: () => {
+            uni.navigateTo({
+              url:'/pages/patientList/patientList'
+            })
+          },
+        }, ];
+      } else {
+        this.btns = [{
+            name: "回到首页",
+            type: "default",
+            click: () => {
+              uni.navigateTo({
+                url: "/pages/index/index",
+              });
+            },
+          },
+          {
+            name: "确认",
+            type: "primary",
+            click: () => {
+              this.submitData();
+            },
+          },
+        ]
+      }
       this.getData(this.qucikCreateOrderType, this.qucikCreateOrderTypeId);
     },
   };

store/modules/other.js

@@ -6,6 +6,7 @@ const stateReset = {
   qucikCreateOrderTypeId: "", //快捷建单类型id
   patientBuildTrip: {}, //患者建单的buildTrip
   patientBuildData: {}, //患者建单的请求参数数据
+  patientTaskTypeName: '', //患者建单的任务类型名称
   deptDisplay: 1, //护士端科室显示选择(名称还是别名)1是名称，2是别名
   updateTipsForNurses: "", //护士端更新提示
   specimenButton: "", //标本按钮文字
@@ -37,6 +38,7 @@ const mutations = {
     state.qucikCreateOrderType = args.type;
     state.qucikCreateOrderTypeId = args.taskTypeId;
     state.patientBuildTrip = args.patientBuildTrip;
+    state.patientTaskTypeName = args.patientTaskTypeName;
   },
   //护士端科室显示选择(名称还是别名)1是名称，2是别名
   changeDeptDisplay(state, args) {