其他临床服务终点科室备注

components/smallScreen/smallScreen.vue

@@ -354,11 +354,11 @@
             if (result.state == 200 || result.state == 201) {
               if (result.account) {
                 if (type == 1) {
-                  this.nextDeptOrder_ss(this.currentData, {
+                  this.isOpenTransportationProcessRemarks(this.currentData, {
                     account: result.account,
                     accountName: result.name,
                     accountId: result.id,
-                  });
+                  }, 'nextDeptOrder_ss');
                 } else if (type == 2) {
                   this.nextDeptOrder_s(this.currentData, {
                     account: result.account,
@@ -368,7 +368,7 @@
                 }
               } else {
                 if (type == 1) {
-                  this.nextDeptOrder_ss(this.currentData);
+                  this.isOpenTransportationProcessRemarks(this.currentData, undefined, 'nextDeptOrder_ss');
                 } else if (type == 2) {
                   this.nextDeptOrder_s(this.currentData);
                 }
@@ -443,7 +443,7 @@
           associationTypeValue !== "specimen" &&
           associationTypeValue !== "specimenPlan"
         ) {
-          this.nextDeptOrder_ss(this.currentData, data);
+          this.isOpenTransportationProcessRemarks(this.currentData, data, 'nextDeptOrder_ss');
         }
       },
       // 填写交接人账号-取消
@@ -457,6 +457,18 @@
           disjunctor: true,
         }
       },
+      // 其他临床服务-运输过程-终点科室是否开通备注填写
+      isOpenTransportationProcessRemarks(data, accountObj, funName){
+        const tasktype = data.taskType;
+        console.log(tasktype, data);
+        if(tasktype.associationType.value === 'other' && tasktype.carryingCourses[1].logSwitch && data.gdState.value == 5){
+          uni.navigateTo({
+            url: `../../pages/transportationProcessRemarks/transportationProcessRemarks?data=${data ? encodeURIComponent(JSON.stringify(data)) : ''}&accountObj=${accountObj ? encodeURIComponent(JSON.stringify(accountObj)) : ''}&currentCode=${this.currentCode}&funName=${funName}&actions=${this.actions ? encodeURIComponent(JSON.stringify(this.actions)) : ''}&imageValue=${this.imageValue ? encodeURIComponent(JSON.stringify(this.imageValue)) : ''}`
+          })
+        }else{
+          this[funName](data, accountObj);
+        }
+      },
     },
     components: {
       selectAccount

pages.json

@@ -413,6 +413,13 @@
           "titleNView": false
         }
       }
+    }, {
+      "path": "pages/transportationProcessRemarks/transportationProcessRemarks",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
     }
   ],
   "globalStyle": {

pages/otherCompleteOrder/otherCompleteOrder.vue

@@ -34,6 +34,7 @@
 </template>
 
 <script>
+  import * as commonFun from '../../tools/commonFun.js';
   import {
     pathUrl
   } from "../../tools/photograph.js";
@@ -70,108 +71,18 @@
       };
     },
     methods: {
-      // 完成工单
-      postWorkerOrder(data, accountObj){
-        let isKs = 0;
-        let ids = [];
-        let id = data.id;
-        ids.push(id);
-        let list = {
-          code: "",
-          ids: ids,
-        };
-        let code = "";
-        let type = "";
-        let gdStateValue = data.gdState.value; //工单状态value
-        let associationTypeValue = data.taskType.associationType.value; //关联类型value
-        
-        // 其他临床服务，并且工单状态是待到达||工单状态待送达
-        if (
-          (associationTypeValue == "other" &&
-            gdStateValue == "4") ||
-          gdStateValue == "5"
-        ) {
-          code = this.currentCode;
-          type = "orderSign/" + code;
-          list = {
-            ids
-          };
-          if (accountObj) {
-            list.handover = [accountObj.accountId];
-          }
-          isKs = 1;
-        }
-        post("/workerOrder/" + type, list).then((res) => {
-          console.log(res);
-          uni.hideLoading();
-          if (res) {
-            if (res.status == 200) {
-              if (
-                gdStateValue == "4" &&
-                associationTypeValue == "other"
-              ) {
-                uni.navigateTo({
-                  url: `../../pages/scanning_code/scanning_code?type=${associationTypeValue}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
-                });
-              }
-              if (gdStateValue == "5") {
-                uni.navigateTo({
-                  url: `../../pages/scanning_code/scanning_code?type=${associationTypeValue}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
-                });
-              }
-            } else {
-              uni.navigateTo({
-                url: `../../pages/scanning_Result/scanning_Result?type=${
-                associationTypeValue
-              }&type1=${res.type}&id=${data.id}&status=600&msg=${
-                res.msg
-              }&isKs=${isKs}&model=${encodeURIComponent(
-                JSON.stringify(res)
-              )}&qrcode=${this.currentCode}`,
-              });
-            }
-          } else {
-            uni.navigateTo({
-              url: `../../pages/scanning_Result/scanning_Result?id=${data.id}&status=600&msg=扫码失败！请扫描正确的二维码！&isKs=${isKs}&qrcode=${this.currentCode}`,
-            });
-          }
-        });
-      },
-      // 如果不是静配，药配，标本配送,标本轮巡
-      // 科室签到（小扫描）-拍照
-      nextDeptOrder_ss(data, accountObj) {
-        console.log(this.currentCode);
-        if (this.currentCode) {
-          // 动作
-          let actions = this.actions.filter(v => v.checked);
-          let actionRemarks = actions.map(v => v.name).toString();
-          uni.showLoading({
-            title: "加载中",
-            mask: true,
-          });
-          if(actionRemarks){
-            post("/workerOrder/addOtherRemarks", {
-              orderId: data.id,
-              actionRemarks: actionRemarks,
-            }).then((result1) => {
-              if(result1.state == 200){
-                this.postWorkerOrder(data, accountObj);
-              }else{
-                uni.hideLoading();
-                uni.showToast({
-                  icon: "none",
-                  title: "请求失败！",
-                });
-              }
-            });
-          }else{
-            this.postWorkerOrder(data, accountObj);
-          }
+      // 其他临床服务-运输过程-终点科室是否开通备注填写
+      isOpenTransportationProcessRemarks(data, accountObj, funName){
+        const tasktype = data.taskType;
+        console.log(tasktype, data);
+        if(tasktype.associationType.value === 'other' && tasktype.carryingCourses[1].logSwitch && data.gdState.value == 5){
+          uni.navigateTo({
+            url: `../../pages/transportationProcessRemarks/transportationProcessRemarks?data=${data ? encodeURIComponent(JSON.stringify(data)) : ''}&accountObj=${accountObj ? encodeURIComponent(JSON.stringify(accountObj)) : ''}&currentCode=${this.currentCode}&funName=${funName}&actions=${this.actions ? encodeURIComponent(JSON.stringify(this.actions)) : ''}&imageValue=${this.imageValue ? encodeURIComponent(JSON.stringify(this.imageValue)) : ''}`
+          })
         }else{
-          uni.hideLoading();
+          commonFun[funName](this, data, accountObj);
         }
       },
-      
       // 填写交接人账号-确认
       hosOk(data) {
         console.log(data);
@@ -215,13 +126,13 @@
         let associationTypeValue = this.currentData.taskType.associationType.value;
         console.log(associationTypeValue)
         if(this.actionPhotoSwitch && this.actionConfirmSwitch){
-          this.uploadToOther(this.currentData, data, 'end');
+          this.isOpenTransportationProcessRemarks(this.currentData, data, 'uploadToOther');
         }else if(this.actionConfirmSwitch){
           // 动作
-          this.nextDeptOrder_ss(this.currentData, data, 'end');
+          this.isOpenTransportationProcessRemarks(this.currentData, data, 'nextDeptOrder_ss');
         }else if(this.actionPhotoSwitch){
           // 拍照
-          this.uploadToOther(this.currentData, data, 'end');
+          this.isOpenTransportationProcessRemarks(this.currentData, data, 'uploadToOther');
         }
       },
       // 填写交接人账号-取消
@@ -283,13 +194,13 @@
             }
             
             if(this.actionPhotoSwitch && this.actionConfirmSwitch){
-              this.uploadToOther(data, accountObj, type);
+              this.isOpenTransportationProcessRemarks(data, accountObj, 'uploadToOther');
             }else if(this.actionConfirmSwitch){
               // 动作
-              this.nextDeptOrder_ss(data, accountObj, type);
+              this.isOpenTransportationProcessRemarks(data, accountObj, 'nextDeptOrder_ss');
             }else if(this.actionPhotoSwitch){
               // 拍照
-              this.uploadToOther(data, accountObj, type);
+              this.isOpenTransportationProcessRemarks(data, accountObj, 'uploadToOther');
             }
           } else if (result.state == '0000') {
             uni.hideLoading();
@@ -303,126 +214,6 @@
           }
         });
       },
-      // 完成工单
-      uploadToOther(data, accountObj, type){
-        let imageValue = this.imageValue;
-        // 完成工单
-        post('/workerOrder/findRecordInfoByOrderId', {
-          orderId: this.orderId,
-          gdOperate: 22,
-        }).then(result => {
-          if (result.state == 200) {
-            uni.showLoading({
-              mask: true,
-              title: '加载中'
-            });
-            let n = 0;
-            //#ifdef H5
-            imageValue.forEach((v) => {
-              // 图片上传 start
-              console.log("压缩前");
-              let canvasWidth = v.image.width; //图片原始长宽
-              let canvasHeight = v.image.height;
-              let img = new Image();
-              img.src = v.path;
-              let canvas = document.createElement("canvas");
-              let ctx = canvas.getContext("2d");
-              canvas.width = canvasWidth;
-              canvas.height = canvasHeight;
-              ctx.drawImage(img, 0, 0, canvasWidth, canvasHeight);
-              canvas.toBlob(
-                (fileSrc) => {
-                  let tp = window.URL.createObjectURL(fileSrc);
-                  console.log("压缩后");
-                  n++;
-                  uni.uploadFile({
-                    url: pathUrl +
-                      "/common/common/uploadAttachment/orderEndPhoto/" +
-                      this.orderId +
-                      "/" + result.recordId,
-                    filePath: tp,
-                    name: "file",
-                    formData: {
-                      filename: v.name,
-                    },
-                    success: (uploadFileRes) => {
-                      console.log(uploadFileRes);
-                      if (--n === 0) {
-                        this.nextDeptOrder_ss(data, accountObj, type);
-                      }
-                    },
-                    fail: (err) => {
-                      n--;
-                      console.error(err);
-                      uni.showToast({
-                        icon: "none",
-                        title: "上传失败",
-                        duration: 2000,
-                      });
-                    },
-                  });
-                },
-                "image/jpeg",
-                0.1
-              );
-              // 图片上传 end
-            });
-            //#endif
-            //#ifdef APP-PLUS
-            imageValue.forEach((v) => {
-              // 图片上传 start
-              uni.compressImage({
-                src: v.path,
-                quality: 30,
-                success: (res) => {
-                  console.log('压缩前', res)
-                  let tp = res.tempFilePath;
-                  console.log("压缩后");
-                  n++;
-                  uni.uploadFile({
-                    url: pathUrl +
-                      "/common/common/uploadAttachment/orderEndPhoto/" +
-                      this.orderId +
-                      "/" + result.recordId,
-                    filePath: tp,
-                    name: "file",
-                    formData: {
-                      filename: v.name,
-                    },
-                    success: (uploadFileRes) => {
-                      console.log(uploadFileRes);
-                      if (--n === 0) {
-                        this.nextDeptOrder_ss(data, accountObj, type);
-                      }
-                    },
-                    fail: (err) => {
-                      n--;
-                      console.error(err);
-                      uni.showToast({
-                        icon: "none",
-                        title: "上传失败",
-                        duration: 2000,
-                      });
-                    },
-                  });
-                },
-                fail: function () {
-                  uni.hideLoading();
-                  uni.showToast({
-                    icon: 'none',
-                    title: '上传失败',
-                    duration: 2000
-                  });
-                }
-              })
-              // 图片上传 end
-            });
-            //#endif
-          }else{
-            uni.hideLoading();
-          }
-        })
-      },
       // 返回
       goBack() {
         uni.navigateBack();

pages/transportationProcessRemarks/transportationProcessRemarks.vue

@@ -0,0 +1,128 @@
+<template>
+  <view class="transportationProcessRemarks">
+    <view class="uni-list-cell">
+      <view class="uni-list-cell-left">
+        备注：
+      </view>
+      <view class="uni-list-cell-db">
+        <textarea maxlength="100" class="textarea" v-model="logRemarks" :placeholder="logPrompts" />
+      </view>
+    </view>
+    <view class="uni-list-cell" v-if="customRemarks.length">
+      <view class="uni-list-cell-left">
+        快捷输入：
+      </view>
+      <view class="uni-list-cell-db">
+        <span class="addRemarks" v-for="(item, i) of customRemarks" :key="i" @click="addRemarks(item)">【{{ item }}】</span>
+      </view>
+    </view>
+    <view class="foot_btn_spe">
+      <view class="btn1" @click="postWorkerOrder()">完成工单</view>
+      <view class="btn3" @click="goBack">返回</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import * as commonFun from '../../tools/commonFun.js';
+  import {
+    get,
+    post,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        currentCode: '', //当前拍照使用的科室二维码
+        options: {},
+        logRemarks: '',
+        logPrompts: '',
+        customRemarks: [],
+        //动作列表
+        actions: [],
+        //图片列表
+        imageValue: [],
+      };
+    },
+    methods:{
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      },
+      // 添加备注
+      addRemarks(item) {
+        this.logRemarks += item;
+      },
+      // 完成工单
+      postWorkerOrder(){
+        if(!this.logRemarks.trim()){
+          uni.showToast({
+            icon: "none",
+            title: "请填写备注！",
+          });
+          return;
+        }
+        let data = this.options.data;
+        let accountObj = this.options.accountObj;
+        console.log(commonFun)
+        commonFun[this.options.funName](this, this.options.data, this.options.accountObj);
+      },
+    },
+    onLoad(options) {
+      uni.hideLoading();
+      options.data && (options.data = JSON.parse(options.data));
+      options.accountObj && (options.accountObj = JSON.parse(options.accountObj));
+      options.actions && (options.actions = JSON.parse(options.actions));
+      options.imageValue && (options.imageValue = JSON.parse(options.imageValue));
+      this.options = options;
+      console.log(options);
+      // 待送达
+      if(options.data.taskType.associationType.value == 'other' && options.data.gdState.value == 5){
+        let carryingCourses = options.data.taskType.carryingCourses[1];
+        this.logPrompts = carryingCourses.logPrompts || "请填写备注,不超过100个字符";
+        this.customRemarks = carryingCourses.logRemarks ? carryingCourses.logRemarks.split("$") : [];
+        this.currentCode = options.currentCode;
+        this.actions = options.actions;
+        this.imageValue = options.imageValue;
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+.transportationProcessRemarks{
+  padding: 16rpx;
+  .textarea{
+    width: 100%;
+    border: 2rpx solid #d9d9d9;
+  }
+  .foot_btn_spe {
+    width: 100%;
+    position: fixed;
+    bottom: 30rpx;
+    left: 0;
+    line-height: 88rpx;
+    height: 88rpx;
+    text-align: center;
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+  
+    &::after {
+      content: '';
+      flex: 1;
+    }
+  
+    view {
+      height: 88rpx;
+      width: 48%;
+      margin: 0 1%;
+      background-image: linear-gradient(to right, #72c172, #3bb197);
+      color: #fff;
+      border-radius: 8rpx;
+      font-size: 32rpx;
+      margin-top: 16rpx;
+    }
+  }
+}
+</style>

tools/commonFun.js

@@ -0,0 +1,235 @@
+import { get, post } from '../http/http.js'
+import { pathUrl } from "../tools/photograph.js";
+
+// 如果不是静配，药配，标本配送,标本轮巡
+// 科室签到（小扫描）-拍照
+export function nextDeptOrder_ss(_this, data, accountObj) {
+  uni.showLoading({
+    title: "加载中",
+    mask: true,
+  });
+  _this.actions = _this.actions || [];
+  console.log(_this.currentCode);
+  if (_this.currentCode) {
+    // 动作
+    let actions = _this.actions.filter(v => v.checked);
+    let actionRemarks = actions.map(v => v.name).toString();
+    if(actionRemarks){
+      post("/workerOrder/addOtherRemarks", {
+        orderId: data.id,
+        actionRemarks: actionRemarks,
+      }).then((result1) => {
+        if(result1.state == 200){
+          postWorkerOrder(_this, data, accountObj);
+        }else{
+          uni.hideLoading();
+          uni.showToast({
+            icon: "none",
+            title: "请求失败！",
+          });
+        }
+      });
+    }else{
+      postWorkerOrder(_this, data, accountObj);
+    }
+  }else{
+    uni.hideLoading();
+  }
+}
+
+// 完成工单
+export function uploadToOther(_this, data, accountObj){
+  uni.showLoading({
+    mask: true,
+    title: '加载中'
+  });
+  _this.imageValue = _this.imageValue || [];
+  let imageValue = _this.imageValue;
+  // 完成工单
+  post('/workerOrder/findRecordInfoByOrderId', {
+    orderId: data.id,
+    gdOperate: 22,
+  }).then(result => {
+    if (result.state == 200) {
+      let n = 0;
+      //#ifdef H5
+      imageValue.forEach((v) => {
+        // 图片上传 start
+        console.log("压缩前");
+        let canvasWidth = v.image.width; //图片原始长宽
+        let canvasHeight = v.image.height;
+        let img = new Image();
+        img.src = v.path;
+        let canvas = document.createElement("canvas");
+        let ctx = canvas.getContext("2d");
+        canvas.width = canvasWidth;
+        canvas.height = canvasHeight;
+        ctx.drawImage(img, 0, 0, canvasWidth, canvasHeight);
+        canvas.toBlob(
+          (fileSrc) => {
+            let tp = window.URL.createObjectURL(fileSrc);
+            console.log("压缩后");
+            n++;
+            uni.uploadFile({
+              url: pathUrl +
+                "/common/common/uploadAttachment/orderEndPhoto/" +
+                data.id +
+                "/" + result.recordId,
+              filePath: tp,
+              name: "file",
+              formData: {
+                filename: v.name,
+              },
+              success: (uploadFileRes) => {
+                console.log(uploadFileRes);
+                if (--n === 0) {
+                  nextDeptOrder_ss(_this, data, accountObj);
+                }
+              },
+              fail: (err) => {
+                n--;
+                console.error(err);
+                uni.showToast({
+                  icon: "none",
+                  title: "上传失败",
+                  duration: 2000,
+                });
+              },
+            });
+          },
+          "image/jpeg",
+          0.1
+        );
+        // 图片上传 end
+      });
+      //#endif
+      //#ifdef APP-PLUS
+      imageValue.forEach((v) => {
+        // 图片上传 start
+        uni.compressImage({
+          src: v.path,
+          quality: 30,
+          success: (res) => {
+            console.log('压缩前', res)
+            let tp = res.tempFilePath;
+            console.log("压缩后");
+            n++;
+            uni.uploadFile({
+              url: pathUrl +
+                "/common/common/uploadAttachment/orderEndPhoto/" +
+                data.id +
+                "/" + result.recordId,
+              filePath: tp,
+              name: "file",
+              formData: {
+                filename: v.name,
+              },
+              success: (uploadFileRes) => {
+                console.log(uploadFileRes);
+                if (--n === 0) {
+                  nextDeptOrder_ss(_this, data, accountObj);
+                }
+              },
+              fail: (err) => {
+                n--;
+                console.error(err);
+                uni.showToast({
+                  icon: "none",
+                  title: "上传失败",
+                  duration: 2000,
+                });
+              },
+            });
+          },
+          fail: function () {
+            uni.hideLoading();
+            uni.showToast({
+              icon: 'none',
+              title: '上传失败',
+              duration: 2000
+            });
+          }
+        })
+        // 图片上传 end
+      });
+      //#endif
+    }else{
+      uni.hideLoading();
+    }
+  })
+}
+
+// 完成工单
+export function postWorkerOrder(_this, data, accountObj){
+  uni.showLoading({
+    title: "加载中",
+    mask: true,
+  });
+  let isKs = 0;
+  let ids = [];
+  let id = data.id;
+  ids.push(id);
+  let list = {
+    code: "",
+    ids: ids,
+  };
+  let code = "";
+  let type = "";
+  let gdStateValue = data.gdState.value; //工单状态value
+  let associationTypeValue = data.taskType.associationType.value; //关联类型value
+  
+  // 其他临床服务，并且工单状态是待到达||工单状态待送达
+  if (
+    (associationTypeValue == "other" &&
+      gdStateValue == "4") ||
+    gdStateValue == "5"
+  ) {
+    code = _this.currentCode;
+    type = "orderSign/" + code;
+    list = {
+      ids
+    };
+    if (accountObj) {
+      list.handover = [accountObj.accountId];
+    }
+    if (_this.logRemarks) {
+      list.logRemarks = _this.logRemarks;
+    }
+    isKs = 1;
+  }
+  post("/workerOrder/" + type, list).then((res) => {
+    console.log(res);
+    uni.hideLoading();
+    if (res) {
+      if (res.status == 200) {
+        if (
+          gdStateValue == "4" &&
+          associationTypeValue == "other"
+        ) {
+          uni.navigateTo({
+            url: `../../pages/scanning_code/scanning_code?type=${associationTypeValue}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
+          });
+        }
+        if (gdStateValue == "5") {
+          uni.navigateTo({
+            url: `../../pages/scanning_code/scanning_code?type=${associationTypeValue}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
+          });
+        }
+      } else {
+        uni.navigateTo({
+          url: `../../pages/scanning_Result/scanning_Result?type=${
+          associationTypeValue
+        }&type1=${res.type}&id=${data.id}&status=600&msg=${
+          res.msg
+        }&isKs=${isKs}&model=${encodeURIComponent(
+          JSON.stringify(res)
+        )}&qrcode=${_this.currentCode}`,
+        });
+      }
+    } else {
+      uni.navigateTo({
+        url: `../../pages/scanning_Result/scanning_Result?id=${data.id}&status=600&msg=扫码失败！请扫描正确的二维码！&isKs=${isKs}&qrcode=${_this.currentCode}`,
+      });
+    }
+  });
+}