解决冲突

components/bigScreen/bigScreen.vue

@@ -219,6 +219,177 @@
           }
         });
       },
+      //获取药包信息
+      getInfo(responeseData, code){
+        console.log(responeseData);
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+
+        post(`/transflow/scanInfo`, {type: responeseData.drugsBagType, id: responeseData.drugsBagId, orderStateValue: responeseData.orderStateValue}).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+            if(res.data){
+              let drugsBag = res.data.dto || {};
+              let orderId = responeseData.orderId;
+              let config = res.data.taskTypeConfig || {};
+              console.log(res);
+              if(responeseData.orderStateValue == 2 || responeseData.orderStateValue == 3 || (responeseData.orderStateValue == 4 && responeseData.workerId == uni.getStorageSync('userData').user.id)){
+                // 待抢单、待接单、待到达(本人),进入起点科室流程
+                uni.navigateTo({
+                  url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${responeseData.drugsBagType}&drugsBagId=${responeseData.drugsBagId}&orderId=${responeseData.orderId || ''}&type=receive`,
+                });
+              }else if(responeseData.orderStateValue == 5 && responeseData.workerId == uni.getStorageSync('userData').user.id){
+                // 待送达(本人),进入终点科室流程
+                this.pageNavigateByConfig(config, responeseData, responeseData, code)
+              }else{
+                // 查看药包信息
+                uni.navigateTo({
+                  url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${responeseData.drugsBagType}&drugsBagId=${responeseData.drugsBagId}&type=view`,
+                });
+              }
+            }
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+      // 工单完成
+      completeOrder(responseData, queryObj){
+        console.log(responseData, queryObj)
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        let postData = {
+          "type": queryObj.drugsBagType,
+          "orderId": responseData.orderId,
+        };
+        post('/transflow/checkComplete', postData).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+             uni.showToast({
+               icon: "none",
+               title: responseData.orderStateValue == 4 ? "交接成功，请尽快送达科室！" : (responseData.orderStateValue == 5 ? "交接成功，完成配送！" : ""),
+               duration: 60000,
+               mask: true,
+               complete(){
+                 setTimeout(() => {
+                   uni.hideToast();
+                   uni.redirectTo({
+                     url: `/pages/receiptpage/receiptpage`,
+                   });
+                 }, 2000)
+               }
+             });
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+      // 根据配置跳转页面
+      pageNavigateByConfig(config, responseData, queryObj, code){
+        let drugsBagType = queryObj.drugsBagType;
+        let orderId = responseData.orderId;
+        let drugsBagId = responseData.drugsBagId;
+        let orderStateValue = responseData.orderStateValue;
+        if(config.drugsModel === 1){
+          // 一单一码
+          if(responseData.orderStateValue == 4){
+            // 待到达
+            if(config.drugsStartCheck === 1){
+              // 起点科室支持核对
+              uni.navigateTo({
+                url: `/pages/newDrug/checkPage/checkPage?drugsBagType=${drugsBagType}&orderId=${orderId}`,
+              });
+            }else{
+              // 起点科室不支持核对
+              if(config.drugsStartPhoto === 1){
+                // 起点科室支持拍照留存
+                uni.navigateTo({
+                  url: `/pages/newDrug/photoRetention/photoRetention?drugsBagType=${drugsBagType}&orderId=${orderId}`,
+                });
+              }else{
+                // 起点科室不支持拍照留存
+                this.completeOrder(responseData, queryObj);
+              }
+            }
+          }else if(responseData.orderStateValue == 5){
+            // 待送达
+            uni.showLoading({
+              title: "加载中",
+              mask: true,
+            });
+            post("/transflow/scanBind", { type: drugsBagType, orderId, code }).then((ress) => {
+              uni.hideLoading();
+              if (ress.state == 200) {
+                if(ress.data.msg){
+                  uni.showToast({
+                    icon: "none",
+                    title: ress.data.msg || "接口获取数据失败！",
+                  });
+                }else{
+                  if(config.drugsEndCheck === 1){
+                    // 起点科室支持核对
+                    uni.navigateTo({
+                      url: `/pages/newDrug/checkPage/checkPage?drugsBagType=${drugsBagType}&orderId=${orderId}`,
+                    });
+                  }else{
+                    // 起点科室不支持核对
+                    if(config.drugsEndPhoto === 1){
+                      // 起点科室支持拍照留存
+                      uni.navigateTo({
+                        url: `/pages/newDrug/photoRetention/photoRetention?drugsBagType=${drugsBagType}&orderId=${orderId}`,
+                      });
+                    }else{
+                      // 终点科室不支持拍照留存
+                      this.completeOrder(responseData, queryObj);
+                    }
+                  }
+                }
+              } else {
+                uni.showToast({
+                  icon: "none",
+                  title: ress.msg || "接口获取数据失败！",
+                });
+              }
+            });
+          }
+        }else if(config.drugsModel === 2){
+          // 一单多码
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          post("/transflow/scanBind", { type: drugsBagType, orderId, code }).then((ress) => {
+            uni.hideLoading();
+            if (ress.state == 200) {
+              if(ress.data.msg){
+                uni.showToast({
+                  icon: "none",
+                  title: ress.data.msg || "接口获取数据失败！",
+                });
+              }else{
+                uni.navigateTo({
+                  url: `/pages/newDrug/continueScanning/continueScanning?drugsBagType=${drugsBagType}&orderId=${orderId}&drugsBagId=${drugsBagId}&orderStateValue=${orderStateValue}`,
+                });
+              }
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: ress.msg || "接口获取数据失败！",
+              });
+            }
+          });
+        }
+      },
       // 底部扫描
       Scanning(qrcodePrefix = '') {
         if (!this.SMFlag) {
@@ -328,10 +499,23 @@
                           });
                         }
                       } else if (res.type == 'drugsBag') {
-                        //扫药包码
-                        uni.navigateTo({
-                          url: `/pages/scanning_drug/scanning_drug?drugsBagId=${res.drugsBagId}&drugsBagBatchNo=${res.drugsBagBatchNo}`,
-                        });
+                        if (res.drugsBagType == 'drugsJpbag' || res.drugsBagType == 'drugsWestern' || res.drugsBagType == 'drugsReturn' || res.drugsBagType == 'drugsPoison' || res.drugsBagType == 'drugsHerbal') {
+                          //新药品-扫静配|西药|退药|毒麻|中草药
+                          if(res.orderId){
+                            // 有工单
+                            this.getInfo(res, code);
+                          }else{
+                            // 没有工单,进入起点科室流程
+                            uni.navigateTo({
+                              url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${res.drugsBagType}&drugsBagId=${res.drugsBagId}&type=build`,
+                            });
+                          }
+                        }else{
+                          //扫药包码
+                          uni.navigateTo({
+                            url: `/pages/scanning_drug/scanning_drug?drugsBagId=${res.drugsBagId}&drugsBagBatchNo=${res.drugsBagBatchNo}`,
+                          });
+                        }
                       } else if (res.type == 'nucleicAcid') {
                         //扫核酸码
                         uni.navigateTo({

http/http.js

@@ -284,3 +284,10 @@ function startAudio() {
   //     }
   // });
 }
+
+/**
+ * 上传附件
+ */
+export function api_uploadAttachment(type, id){
+  return `${path}/common/common/uploadAttachment/${type}/${id}/${id}`
+}

pages.json

@@ -656,7 +656,55 @@
 		      "titleNView": false
 		    }
 		  }
-		}
+		},
+    {
+      "path": "pages/newDrug/detail", //新药品-药品详情
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    },
+    {
+      "path": "pages/newDrug/list", //新药品-药品列表
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    },
+    {
+      "path": "pages/newDrug/createOrder/createOrder", //新药品-创建工单
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    },
+    {
+      "path": "pages/newDrug/continueScanning/continueScanning", //新药品-继续扫描
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    },
+    {
+      "path": "pages/newDrug/checkPage/checkPage", //新药品-核对交接
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    },
+    {
+      "path": "pages/newDrug/photoRetention/photoRetention", //新药品-照片留存
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    }
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",

pages/newDrug/checkPage/checkPage.vue

@@ -0,0 +1,448 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        {{workOrder.startDept ? workOrder.startDept.dept : ''}}<text class="newicon newicon-arrow-right-full"></text>{{workOrder.endDeptNames || ''}}
+      </view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view class="column head">
+        <view class="value1">单号<text class="red">（{{drugsBagList.length}}）</text></view>
+        <view class="value2">种类数</view>
+        <view class="value3">总数</view>
+      </view>
+      <scroll-view scroll-y class="scrollContent">
+        <view class="column" v-for="item in drugsBagList" :key="item.id" @click="toDetail(item.id)">
+          <view class="value1">{{item.batchNo}}</view>
+          <view class="value2">{{item.drugsTypeCount}}</view>
+          <view class="value3">{{item.drugsCount}}</view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <view class="foot_btn_spe">
+      <view class="column">
+        <view class="btn" @click="scanCode()">扫一扫交接</view>
+        <view class="btn" @click="fillInManually(config.drugsStartManual.value)" v-if="workOrder.gdState && workOrder.gdState.value == 4 && config.drugsStartManual">{{config.drugsStartManual.name}}</view>
+        <view class="btn" @click="fillInManually(config.drugsStartManual.value)" v-if="workOrder.gdState && workOrder.gdState.value == 5 && config.drugsEndManual">{{config.drugsEndManual.name}}</view>
+      </view>
+    </view>
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount @click.stop.native v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+      @cancel="hosCancel">
+    </selectAccount>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "@/http/http.js";
+  export default {
+    data() {
+      return {
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        drugsBagList: [], //药包列表
+        queryObj: {}, //路由传递过来的数据
+        workOrder: {}, //工单信息
+        config: {}, //配置
+        SMFlag: true, //控制扫码
+        // 填写交接人工号弹窗model
+        hosModels: {
+          disjunctor: false,
+        },
+      };
+    },
+    onShow() {
+      this.SMFlag = true;
+    },
+    methods: {
+      // 手动填写
+      fillInManually(value){
+        if(value == 1){
+          // 填写工号
+          this.showSelectAccount();
+        }
+      },
+      // 填写交接人工号-确认
+      hosOk(data) {
+        console.log(data);
+        const {
+          accountName,
+          account,
+          accountId
+        } = data;
+        if (!accountName && !account) {
+          //没有填写交接人
+          uni.showModal({
+            title: "提示",
+            content: "请填写交接人工号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        } else if ((!accountName && account) || (accountName && !account)) {
+          //没有填写交接人
+          uni.showModal({
+            title: "提示",
+            content: "请填写正确的交接人工号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        }
+        this.hosModels.disjunctor = false;
+        this.validateAccount(data);
+      },
+      // 填写交接人工号-取消
+      hosCancel() {
+        this.hosModels.disjunctor = false;
+        this.flag = true;
+      },
+      // 填写交接人工号弹窗
+      showSelectAccount() {
+        this.hosModels = {
+          disjunctor: true,
+        };
+      },
+      // 手动填写工号校验
+      validateAccount(accountObj){
+        const {
+          accountName,
+          account,
+          accountId
+        } = accountObj;
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+
+        let postData = {
+          extraType: 'inputAccountValid',
+          type: this.queryObj.drugsBagType,
+          orderStateValue: this.workOrder.gdState.value,
+          userId: accountId,
+          orderId: this.workOrder.id,
+        }
+
+        post("/transflow/extra", postData)
+          .then((res) => {
+            uni.hideLoading();
+            if(res.state == 200){
+              if(res.data){
+                if (res.data.codeBean) {
+                  if(res.data.codeBean.valid){
+                    this.pageNavigateByConfig(this.config, this.workOrder, this.queryObj, { id: accountId, name: accountName }, res.data.codeBean.departmentDTO);
+                  }else{
+                    uni.showToast({
+                      icon: "none",
+                      title: res.data.codeBean.msg || "接口获取数据失败！",
+                    });
+                  }
+                } else {
+                  uni.showToast({
+                    icon: "none",
+                    title: "接口获取数据失败！",
+                  });
+                }
+              }else{
+                uni.showToast({
+                  icon: "none",
+                  title: "接口获取数据失败！",
+                });
+              }
+            }else{
+              uni.showToast({
+                icon: "none",
+                title: res.msg || "接口获取数据失败！",
+              });
+            }
+          });
+      },
+      // 工单完成
+      completeOrder(workOrder, queryObj, accountObj){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        let postData = {
+          "type": queryObj.drugsBagType,
+          "orderId": workOrder.id,
+          "handover": accountObj ? accountObj.id : undefined,
+        };
+        post('/transflow/checkComplete', postData).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+            uni.showToast({
+              icon: "none",
+              title: workOrder.gdState.value == 4 ? "交接成功，请尽快送达科室！" : (workOrder.gdState.value == 5 ? "交接成功，完成配送！" : ""),
+              duration: 60000,
+              mask: true,
+              complete(){
+                setTimeout(() => {
+                  uni.hideToast();
+                  uni.redirectTo({
+                    url: `/pages/receiptpage/receiptpage`,
+                  });
+                }, 2000)
+              }
+            });
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+      // 根据配置跳转页面
+      pageNavigateByConfig(config, workOrder, queryObj, accountObj, departmentDTO){
+        console.log(accountObj, departmentDTO);
+        let drugsBagType = queryObj.drugsBagType;
+        let orderId = workOrder.id;
+        if(workOrder.gdState.value == 4){
+          // 待到达
+          if(config.drugsStartPhoto === 1){
+            // 起点科室支持拍照留存
+            uni.navigateTo({
+              url: `/pages/newDrug/photoRetention/photoRetention?drugsBagType=${drugsBagType}&orderId=${orderId}&accountId=${accountObj ? accountObj.id : ''}&accountName=${accountObj ? accountObj.name : ''}&accountDeptName=${departmentDTO ? departmentDTO.dept : ''}`,
+            });
+          }else{
+            // 起点科室不支持拍照留存
+            this.completeOrder(workOrder, queryObj, accountObj);
+          }
+        }else if(workOrder.gdState.value == 5){
+          // 待送达
+          if(config.drugsEndPhoto === 1){
+            // 起点科室支持拍照留存
+            uni.navigateTo({
+              url: `/pages/newDrug/photoRetention/photoRetention?drugsBagType=${drugsBagType}&orderId=${orderId}&accountId=${accountObj ? accountObj.id : ''}&accountName=${accountObj ? accountObj.name : ''}&accountDeptName=${departmentDTO ? departmentDTO.dept : ''}`,
+            });
+          }else{
+            // 起点科室不支持拍照留存
+            this.completeOrder(workOrder, queryObj, accountObj);
+          }
+        }
+      },
+      // 扫一扫交接
+      scanCode(){
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        SM().then((content) => {
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+
+          let postData = {
+            type: this.queryObj.drugsBagType,
+            orderStateValue: this.workOrder.gdState.value,
+            code: content,
+            orderId: this.workOrder.id,
+          }
+
+          post("/transflow/bigScan", postData)
+            .then((res) => {
+              this.SMFlag = true;
+              uni.hideLoading();
+              if (res.codeBean) {
+                if(res.codeBean.valid){
+                  this.pageNavigateByConfig(this.config, this.workOrder, this.queryObj, res.codeBean.userDTO, res.codeBean.departmentDTO);
+                }else{
+                  uni.showToast({
+                    icon: "none",
+                    title: res.codeBean.msg || "接口获取数据失败！",
+                  });
+                }
+              } else {
+                uni.showToast({
+                  icon: "none",
+                  title: "接口获取数据失败！",
+                });
+              }
+            });
+        }).catch(err => {
+          this.SMFlag = true;
+        });
+      },
+      // 详情
+      toDetail(drugsBagId){
+        uni.navigateTo({
+          url: `/pages/newDrug/detail?drugsBagType=${this.queryObj.drugsBagType}&drugsBagId=${drugsBagId}`,
+        });
+      },
+      // 初始化
+      init(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+
+        let info$ = post(`/transflow/extra`, {type: this.queryObj.drugsBagType, extraType: 'orderInfo', orderId: +this.queryObj.orderId, checkComplete: '1'});
+        let config$ = post(`/simple/data/fetchDataList/taskTypeConfig`, {
+            "idx": 0,
+            "sum": 1,
+            "taskTypeConfig": {
+                "taskTypeDTO": {
+                    "hosId": {
+                        "id": this.hosId
+                    },
+                    "ordinaryField": {
+                        "key": "ordinary_field",
+                        "value": this.queryObj.drugsBagType
+                    }
+                }
+            }
+        });
+
+        Promise.all([info$, config$]).then(result => {
+          uni.hideLoading();
+          let [info, config] = result || [];
+
+          if(info.state == 200){
+            if(info.data){
+              this.drugsBagList = info.data.drugsBagList || [];
+              if(Array.isArray(info.data.workOrder.endDepts)){
+                info.data.workOrder.endDeptNames = info.data.workOrder.endDepts.map(v => v.dept).join();
+              }
+              this.workOrder = info.data.workOrder || {};
+            }
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: info.msg || "接口获取数据失败！",
+            });
+          }
+
+          if(config.status == 200){
+            let list  = config.list || [];
+            this.config = list.length ? list[0] : {};
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: config.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+    },
+    onLoad(options) {
+      console.log(options, "options");
+      this.queryObj = options;
+      this.init();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    background: #FAFBFD;
+    padding: 0 24rpx;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+
+    .Scanning_top {
+      margin: 24rpx auto;
+      .Scanning_top_icon {
+        font-size: 30rpx;
+        font-weight: bold;
+        .newicon{
+          margin: 0 32rpx;
+        }
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      .scrollContent{
+        flex: 1;
+        min-height: 0;
+      }
+      .column{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: 28rpx;
+        padding: 32rpx 24rpx;
+        color: #565656;
+        border-bottom: 1rpx solid #D9D9D9;
+        gap: 8rpx;
+        &.head{
+          font-size: 30rpx;
+          color: #000000;
+          border: 1rpx solid #D9D9D9;
+          box-shadow: 0rpx 3rpx 6rpx 1rpx rgba(0,0,0,0.16);
+          background: #FBFCFE;
+        }
+        .value1{
+          flex: 2;
+          text-align: left;
+          word-break: break-all;
+          flex-shrink: 0;
+        }
+        .value2,.value3{
+          flex: 1;
+          text-align: center;
+          word-break: break-all;
+          flex-shrink: 0;
+        }
+      }
+    }
+
+    .foot_btn_spe {
+      margin: 24rpx 0;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 24rpx;
+      font-weight: bold;
+
+      .column{
+        width: 100%;
+        height: 78rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 24rpx;
+
+        .btn {
+          height: 100%;
+          flex: 1;
+          background: linear-gradient( 90deg, #6FC073 0%, #3DB197 100%);
+          color: #fff;
+          border-radius: 4rpx;
+          font-size: 30rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+    }
+  }
+</style>

pages/newDrug/continueScanning/continueScanning.vue

@@ -0,0 +1,291 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">{{scanCount}}</view>
+    </view>
+
+    <view class="Scanning_cont">
+      <scroll-view scroll-y class="scrollContent">
+        <view class="column">
+          <view class="name">单号：</view>
+          <view class="value">{{drugsBag.batchNo}}</view>
+        </view>
+        <view class="column">
+          <view class="name">申请科室：</view>
+          <view class="value">{{drugsBag.target ? drugsBag.target.dept : ''}}</view>
+        </view>
+        <view class="column">
+          <view class="name">发药科室：</view>
+          <view class="value">{{drugsBag.launch ? drugsBag.launch.dept : ''}}</view>
+        </view>
+        <view class="column">
+          <view class="name">种类数：</view>
+          <view class="value">{{drugsBag.drugsTypeCount}}</view>
+        </view>
+        <view class="column">
+          <view class="name">药品数：</view>
+          <view class="value">{{drugsBag.drugsCount}}</view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <view class="foot_btn_spe">
+      <view class="column">
+        <view class="btn" @click="Scanning_again()">继续扫描</view>
+        <view class="btn" @click="hand_again()">手动录入</view>
+      </view>
+      <view class="column">
+        <view class="btn" @click="checkHandover()">核对交接</view>
+      </view>
+    </view>
+    <!-- 手动查询药品弹窗 -->
+    <handViewDrugsBag v-if="drugbagModels.disjunctor" :title="drugbagModels.title"
+      :disjunctor="drugbagModels.disjunctor" @ok="drugbagOk" @cancel="drugbagCancel">
+    </handViewDrugsBag>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "@/http/http.js";
+  export default {
+    data() {
+      return {
+        drugsBag: {}, //药包信息
+        queryObj: {}, //路由传递过来的数据
+        scanCount: '', //已扫描数量
+        SMFlag: true,
+        // 手动查询弹窗model
+        drugbagModels: {
+          disjunctor: false,
+        },
+      };
+    },
+    onShow() {
+      this.SMFlag = true;
+    },
+    methods: {
+      // 手动查询药品-确认
+      drugbagOk(data) {
+        console.log(data);
+        if (!data.id) {
+          //没有查询到药品
+          uni.showModal({
+            title: '提示',
+            content: "没有查询到发药单号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log('用户点击确定');
+              } else if (res.cancel) {
+                console.log('用户点击取消');
+              }
+            }
+          });
+          return;
+        }
+        this.drugbagModels.disjunctor = false;
+        this.hand_scanning_common(data.packid, 'hand');
+      },
+      // 手动查询药品-取消
+      drugbagCancel() {
+        this.drugbagModels.disjunctor = false;
+      },
+      // 手动查询药品弹窗
+      showHandViewDrugsbag() {
+        this.drugbagModels = {
+          title: '填写发药单号',
+          disjunctor: true,
+        }
+      },
+      // 手动录入
+      hand_again() {
+        this.showHandViewDrugsbag();
+      },
+      // 核对交接
+      checkHandover(){
+        uni.navigateTo({
+          url: `/pages/newDrug/checkPage/checkPage?drugsBagType=${this.queryObj.drugsBagType}&orderId=${this.queryObj.orderId}`,
+        });
+      },
+      // 继续扫描
+      Scanning_again(isFlag = false) {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        SM().then((ress1) => {
+          this.hand_scanning_common(ress1, 'scan', isFlag);
+        }).catch(err => {
+          this.SMFlag = true;
+        });
+      },
+      // 手动输入和扫码公共方法
+      hand_scanning_common(ress1, type, isFlag = false) {
+        // ----------------
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        //检验二维码的有效性
+        post("/dept/scanning", {
+          content: ress1,
+        }).then((result) => {
+          this.SMFlag = true;
+          if (result.state == 200 || result.state == 201) {
+            let codes = result.code;
+            if (codes) {
+              this.input_common(ress1, type, isFlag);
+            } else {
+              uni.hideLoading();
+            }
+          } else {
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              title: result.info || "接口获取数据失败！",
+            });
+          }
+        });
+        // ------------------------------
+      },
+      // 录入到工单
+      input_common(ress1, type, isFlag = false){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/transflow/scanBind", { type: this.queryObj.drugsBagType, orderId: this.queryObj.orderId, code: ress1 }).then((ress) => {
+          uni.hideLoading();
+          if (ress.state == 200) {
+            if(ress.data.msg){
+              uni.showToast({
+                icon: "none",
+                title: ress.data.msg || "接口获取数据失败！",
+              });
+            }else{
+              uni.redirectTo({
+                url: `/pages/newDrug/continueScanning/continueScanning?drugsBagType=${this.queryObj.drugsBagType}&orderId=${this.queryObj.orderId}&scanOrHand=${type}&drugsBagId=${this.queryObj.drugsBagId}&orderStateValue=${this.queryObj.orderStateValue}`,
+              });
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: ress.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      //获取页面信息
+      getInfo(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+
+        post(`/transflow/scanInfo`, {type: this.queryObj.drugsBagType, id: +this.queryObj.drugsBagId, orderStateValue: this.queryObj.orderStateValue, orderId: +this.queryObj.orderId}).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+            if(res.data){
+              this.scanCount = res.data.scanCount;
+              this.drugsBag = res.data.dto || {};
+            }
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+    },
+    onLoad(options) {
+      console.log(options, "options");
+      this.queryObj = options;
+      this.getInfo();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    background: #FAFBFD;
+    padding: 0 24rpx;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+
+    .Scanning_top {
+      margin: 24rpx auto;
+      .Scanning_top_icon {
+        font-size: 140rpx;
+        color: #FF0000;
+        font-weight: bold;
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      .scrollContent{
+        flex: 1;
+        min-height: 0;
+      }
+      .column{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: 30rpx;
+        margin-bottom: 32rpx;
+        .name{
+          font-weight: bold;
+          word-break: break-all;
+          flex-shrink: 0;
+        }
+        .value{
+          word-break: break-all;
+        }
+      }
+    }
+
+    .foot_btn_spe {
+      margin: 24rpx 0;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 24rpx;
+      font-weight: bold;
+
+      .column{
+        width: 100%;
+        height: 78rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 24rpx;
+
+        .btn {
+          height: 100%;
+          flex: 1;
+          background: linear-gradient( 90deg, #6FC073 0%, #3DB197 100%);
+          color: #fff;
+          border-radius: 4rpx;
+          font-size: 30rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+    }
+  }
+</style>

pages/newDrug/createOrder/createOrder.vue

@@ -0,0 +1,311 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-ok newicon newicon-duigou"></text>
+      </view>
+    </view>
+
+    <view class="Scanning_cont">
+      <scroll-view scroll-y class="scrollContent">
+        <view class="column">
+          <view class="name">单号：</view>
+          <view class="value">{{drugsBag.batchNo}}</view>
+        </view>
+        <view class="column">
+          <view class="name">申请科室：</view>
+          <view class="value">{{drugsBag.target ? drugsBag.target.dept : ''}}</view>
+        </view>
+        <view class="column">
+          <view class="name">发药科室：</view>
+          <view class="value">{{drugsBag.launch ? drugsBag.launch.dept : ''}}</view>
+        </view>
+        <view class="column">
+          <view class="name">种类数：</view>
+          <view class="value">{{drugsBag.drugsTypeCount}}</view>
+        </view>
+        <view class="column">
+          <view class="name">药品数：</view>
+          <view class="value">{{drugsBag.drugsCount}}</view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <view class="foot_btn_spe">
+      <view class="column">
+        <view class="btn" @click="goIndex()">知道了</view>
+        <view class="btn" @click="createOrBuildOrder()" v-if="queryObj.type === 'build' && config.drugsCreateSign === 1">建单并签到</view>
+        <view class="btn" @click="createOrBuildOrder(orderId)" v-if="queryObj.type === 'receive' && config.drugsReceiveSign === 1">接单并签到</view>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "@/http/http.js";
+  export default {
+    data() {
+      return {
+        queryObj: {}, //路由传递过来的数据
+        drugsBag: {}, //药包信息
+        config: {}, //药品的业务流程配置
+        orderId: undefined, //根据药包查询到的工单ID
+      };
+    },
+    methods: {
+      // 知道了
+      goIndex(){
+       uni.redirectTo({
+         url: `/pages/receiptpage/receiptpage`,
+       });
+      },
+      // 根据配置跳转页面
+      pageNavigateByConfig(config, responseData, queryObj){
+        let drugsBagType = queryObj.drugsBagType;
+        let orderId = responseData.orderId;
+        let drugsBagId = queryObj.drugsBagId;
+        let orderStateValue = responseData.orderStateValue;
+        if(config.drugsModel === 1){
+          // 一单一码
+          if(responseData.orderStateValue == 4){
+            // 待到达
+            if(config.drugsStartCheck === 1){
+              // 起点科室支持核对
+              uni.navigateTo({
+                url: `/pages/newDrug/checkPage/checkPage?drugsBagType=${drugsBagType}&orderId=${orderId}`,
+              });
+            }else{
+              // 起点科室不支持核对
+              if(config.drugsStartPhoto === 1){
+                // 起点科室支持拍照留存
+                uni.navigateTo({
+                  url: `/pages/newDrug/photoRetention/photoRetention?drugsBagType=${drugsBagType}&orderId=${orderId}`,
+                });
+              }else{
+                // 起点科室不支持拍照留存
+                this.completeOrder(responseData, queryObj);
+              }
+            }
+          }else if(responseData.orderStateValue == 5){
+            // 待送达
+            if(config.drugsEndCheck === 1){
+              // 起点科室支持核对
+              uni.navigateTo({
+                url: `/pages/newDrug/checkPage/checkPage?drugsBagType=${drugsBagType}&orderId=${orderId}`,
+              });
+            }else{
+              // 起点科室不支持核对
+              if(config.drugsEndPhoto === 1){
+                // 起点科室支持拍照留存
+                uni.navigateTo({
+                  url: `/pages/newDrug/photoRetention/photoRetention?drugsBagType=${drugsBagType}&orderId=${orderId}`,
+                });
+              }else{
+                // 起点科室不支持拍照留存
+                this.completeOrder(responseData, queryObj);
+              }
+            }
+          }
+        }else if(config.drugsModel === 2){
+          // 一单多码
+          uni.navigateTo({
+            url: `/pages/newDrug/continueScanning/continueScanning?drugsBagType=${drugsBagType}&orderId=${orderId}&drugsBagId=${drugsBagId}&orderStateValue=${orderStateValue}`,
+          });
+        }
+      },
+      // 工单完成
+      completeOrder(responseData, queryObj){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        let postData = {
+          "type": queryObj.drugsBagType,
+          "orderId": responseData.orderId,
+        };
+        post('/transflow/checkComplete', postData).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+            uni.showToast({
+              icon: "none",
+              title: responseData.orderStateValue == 4 ? "交接成功，请尽快送达科室！" : (responseData.orderStateValue == 5 ? "交接成功，完成配送！" : ""),
+              duration: 60000,
+              mask: true,
+              complete(){
+                setTimeout(() => {
+                  uni.hideToast();
+                  uni.redirectTo({
+                    url: `/pages/receiptpage/receiptpage`,
+                  });
+                }, 2000)
+              }
+            });
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+      // 建单并签到/接单并签到-orderId
+      createOrBuildOrder(orderId){
+        uni.showModal({
+          title: "提示",
+          content: `请确认是否${orderId ? '接' : '建'}单并签到？`,
+          success: (result) => {
+            if (result.confirm) {
+              console.log("用户点击确定");
+              let postData = {
+                type: this.queryObj.drugsBagType,
+                id: +this.queryObj.drugsBagId,
+                orderId,
+              };
+              uni.showLoading({
+                title: "加载中",
+                mask: true,
+              });
+              post(`/transflow/createOrTakeOrder`, postData).then((ress) => {
+                uni.hideLoading();
+                if (ress.state == 200) {
+                  if(ress.data.msg){
+                    uni.showToast({
+                      icon: "none",
+                      title: ress.data.msg || "接口获取数据失败！",
+                    });
+                  }else{
+                    this.pageNavigateByConfig(this.config, ress.data, this.queryObj);
+                  }
+                } else {
+                  uni.showToast({
+                    icon: "none",
+                    title: ress.msg || "接口获取数据失败！",
+                  });
+                }
+              });
+            } else if (result.cancel) {
+              console.log("用户点击取消");
+            }
+          },
+        });
+      },
+      //获取页面信息
+      getInfo(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+
+        post(`/transflow/scanInfo`, {type: this.queryObj.drugsBagType, id: +this.queryObj.drugsBagId, orderStateValue: '4'}).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+            if(res.data){
+              this.drugsBag = res.data.dto || {};
+              this.orderId = this.queryObj.orderId;
+              this.config = res.data.taskTypeConfig || {};
+            }
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+    },
+    onLoad(options) {
+      console.log(options, "options");
+      this.queryObj = options;
+      this.getInfo();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    background: #FAFBFD;
+    padding: 0 24rpx;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+
+    .Scanning_top {
+      margin: 50rpx auto 64rpx;
+      .Scanning_top_icon {
+        width: 128rpx;
+        height: 128rpx;
+        border-radius: 50%;
+
+        .cubeic-ok {
+          font-size: 128rpx;
+          color: #35b34a;
+        }
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      .scrollContent{
+        flex: 1;
+        min-height: 0;
+      }
+      .column{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: 30rpx;
+        margin-bottom: 32rpx;
+        .name{
+          font-weight: bold;
+          word-break: break-all;
+          flex-shrink: 0;
+        }
+        .value{
+          word-break: break-all;
+        }
+      }
+    }
+
+    .foot_btn_spe {
+      margin: 24rpx 0;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 24rpx;
+      font-weight: bold;
+
+      .column{
+        width: 100%;
+        height: 78rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 24rpx;
+
+        .btn {
+          height: 100%;
+          flex: 1;
+          background: linear-gradient( 90deg, #6FC073 0%, #3DB197 100%);
+          color: #fff;
+          border-radius: 4rpx;
+          font-size: 30rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+    }
+  }
+</style>

pages/newDrug/detail.vue

@@ -0,0 +1,220 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">{{drugsBag.batchNo}}</view>
+    </view>
+    <view class="Scanning_top_tips">
+      <view class="info">申请：{{drugsBag.target ? drugsBag.target.dept : ''}}</view>
+      <view class="info">发药：{{drugsBag.launch ? drugsBag.launch.dept : ''}}</view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view class="column head">
+        <view class="value1">药品名称+规格<text class="red">（{{drugsList.length}}）</text></view>
+        <view class="value2">数量</view>
+      </view>
+      <scroll-view scroll-y class="scrollContent">
+        <view class="column" v-for="item in drugsList" :key="item.id">
+          <view class="value1">{{item.drugsInfo}} {{item.model}}</view>
+          <view class="value2">{{item.drugsNum}}</view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <view class="foot_btn_spe">
+      <view class="column">
+        <view class="btn" @click="goBack()">返回</view>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "@/http/http.js";
+  export default {
+    data() {
+      return {
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        drugsList: [], //药品列表
+        queryObj: {}, //路由传递过来的数据
+        drugsBag: {}, //药包信息
+        config: {}, //配置
+      };
+    },
+    methods: {
+      // 返回
+      goBack(){
+        uni.navigateBack()
+      },
+      // 根据药包id查询药品
+      getDrugsByDrugsBugId(drugsBagId){
+        post(`/transflow/extra`, {type: this.queryObj.drugsBagType, extraType: 'drugsInfo', drugsBagId}).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+            if(res.data){
+              this.drugsList = res.data.drugsList || [];
+              this.drugsBag = res.data.drugsBag || {};
+            }
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+      //获取页面信息
+      getInfo(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        
+        if(this.queryObj.drugsBagId){
+          // 根据药包id查询药品
+          this.getDrugsByDrugsBugId(this.queryObj.drugsBagId);
+        }else if(this.queryObj.orderId){
+          // 根据工单id查询药包,此时必是一单一码，即只有一个药包码
+          post(`/transflow/extra`, {type: this.queryObj.drugsBagType, extraType: 'orderInfo', orderId: +this.queryObj.orderId}).then(res => {
+            if(res.state == 200){
+              if(res.data){
+                let drugsBagList = res.data.drugsBagList || [];
+                let drugsBag = drugsBagList[0] || {};
+                if(drugsBag.id){
+                  this.getDrugsByDrugsBugId(drugsBag.id);
+                }else{
+                  uni.hideLoading();
+                  uni.showToast({
+                    icon: "none",
+                    title: "未查询到药品!",
+                  });
+                }
+              }else{
+                uni.hideLoading();
+              }
+            }else{
+              uni.hideLoading();
+              uni.showToast({
+                icon: "none",
+                title: res.msg || "接口获取数据失败！",
+              });
+            }
+          })
+        }
+      },
+    },
+    onLoad(options) {
+      console.log(options, "options");
+      this.queryObj = options;
+      this.getInfo();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    background: #FAFBFD;
+    padding: 0 24rpx;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+
+    .Scanning_top {
+      margin: 32rpx auto;
+      .Scanning_top_icon {
+        font-size: 30rpx;
+        font-weight: bold;
+        .newicon{
+          margin: 0 32rpx;
+        }
+      }
+    }
+    .Scanning_top_tips{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 28rpx;
+      margin-bottom: 32rpx;
+      gap: 64rpx;
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      .scrollContent{
+        flex: 1;
+        min-height: 0;
+      }
+      .column{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: 28rpx;
+        padding: 32rpx 24rpx;
+        color: #565656;
+        border-bottom: 1rpx solid #D9D9D9;
+        gap: 8rpx;
+        &.head{
+          font-size: 30rpx;
+          color: #000000;
+          border: 1rpx solid #D9D9D9;
+          box-shadow: 0rpx 3rpx 6rpx 1rpx rgba(0,0,0,0.16);
+          background: #FBFCFE;
+        }
+        .value1{
+          flex: 2;
+          text-align: left;
+          word-break: break-all;
+          flex-shrink: 0;
+        }
+        .value2,.value3{
+          flex: 1;
+          text-align: center;
+          word-break: break-all;
+          flex-shrink: 0;
+        }
+      }
+    }
+
+    .foot_btn_spe {
+      margin: 24rpx 0;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 24rpx;
+      font-weight: bold;
+      
+      .column{
+        width: 100%;
+        height: 78rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 24rpx;
+        
+        .btn {
+          height: 100%;
+          flex: 1;
+          background: linear-gradient( 90deg, #6FC073 0%, #3DB197 100%);
+          color: #fff;
+          border-radius: 4rpx;
+          font-size: 30rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+    }
+  }
+</style>

pages/newDrug/list.vue

@@ -0,0 +1,189 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_cont">
+      <scroll-view scroll-y class="scrollContent">
+        <view class="column" v-for="item in drugsBagList" :key="item.id" @click="toDetail(item.id)">
+          <view class="head">
+            <view class="name">{{item.batchNo}}</view>
+            <view class="value">{{item.drugsState ? item.drugsState.name : ''}}</view>
+          </view>
+          <view class="body">
+            <view class="bodyColumn">
+              <view class="name">种类数：{{item.drugsTypeCount}}</view>
+              <view class="value">总数：{{item.drugsCount}}</view>
+            </view>
+            <view class="bodyColumn">
+              <view class="name">收取人：<template v-if="item.startLog">{{item.startLog.username}}</template></view>
+              <view class="value">收取时间：<template v-if="item.startLog">{{item.startLog.operationTime | formatDate('yyyy-MM-dd hh:mm')}}</template></view>
+            </view>
+            <view class="bodyColumn">
+              <view class="name">送达人：<template v-if="item.endLog">{{item.endLog.username}}</template></view>
+              <view class="value">送达时间：<template v-if="item.endLog">{{item.endLog.operationTime | formatDate('yyyy-MM-dd hh:mm')}}</template></view>
+            </view>
+            <view class="bodyColumn">
+              <view class="name">收取交接人：<template v-if="item.startLog">{{item.startLog.handoverName}}</template></view>
+              <view class="name">送达交接人：<template v-if="item.endLog">{{item.endLog.handoverName}}</template></view>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "@/http/http.js";
+  export default {
+    data() {
+      return {
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        drugsBagList: [], //药包列表
+        queryObj: {}, //路由传递过来的数据
+        workOrder: {}, //工单信息
+        config: {}, //配置
+      };
+    },
+    methods: {
+      // 详情
+      toDetail(drugsBagId){
+        uni.navigateTo({
+          url: `/pages/newDrug/detail?drugsBagType=${this.queryObj.drugsBagType}&drugsBagId=${drugsBagId}`,
+        });
+      },
+      //获取页面信息
+      getInfo(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+
+        post(`/transflow/extra`, {type: this.queryObj.drugsBagType, extraType: 'orderInfo', orderId: +this.queryObj.orderId}).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+            if(res.data){
+              this.drugsBagList = res.data.drugsBagList || [];
+              this.workOrder = res.data.workOrder || {};
+            }
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+    },
+    onLoad(options) {
+      console.log(options, "options");
+      this.queryObj = options;
+      this.getInfo();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    background: #F7F7F7;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+
+    .Scanning_top {
+      margin: 32rpx auto;
+      .Scanning_top_icon {
+        font-size: 30rpx;
+        font-weight: bold;
+        .newicon{
+          margin: 0 32rpx;
+        }
+      }
+    }
+    .Scanning_top_tips{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 28rpx;
+      margin-bottom: 32rpx;
+      gap: 64rpx;
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      .scrollContent{
+        flex: 1;
+        min-height: 0;
+        overflow: hidden;
+      }
+      .column{
+        background: #FFFFFF;
+        font-size: 24rpx;
+        margin-bottom: 16rpx;
+        .head{
+          padding: 24rpx;
+          display: flex;
+          justify-content: space-between;
+          align-content: center;
+          border-bottom: 1rpx solid #D2D2D2;
+          font-weight: bold;
+        }
+        .body{
+          padding: 24rpx;
+          .bodyColumn{
+            display: flex;
+            justify-content: space-between;
+            align-content: center;
+            margin-top: 24rpx;
+            &:first-of-type{
+              margin-top: 0;
+            }
+            .value{
+              text-align: left;
+            }
+          }
+        }
+      }
+    }
+
+    .foot_btn_spe {
+      margin: 24rpx 0;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 24rpx;
+      font-weight: bold;
+
+      .column{
+        width: 100%;
+        height: 78rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 24rpx;
+
+        .btn {
+          height: 100%;
+          flex: 1;
+          background: linear-gradient( 90deg, #6FC073 0%, #3DB197 100%);
+          color: #fff;
+          border-radius: 4rpx;
+          font-size: 30rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+    }
+  }
+</style>

pages/newDrug/photoRetention/photoRetention.vue

@@ -0,0 +1,371 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        您需要上传图片留存，请拍摄照片上传！
+      </view>
+    </view>
+
+    <view class="Scanning_cont">
+      <scroll-view scroll-y class="scrollContent">
+        <view class="content">
+          <view class="dept">
+            {{workOrder.startDept ? workOrder.startDept.dept : ''}}<text class="newicon newicon-arrow-right-full"></text>{{workOrder.endDeptNames || ''}}
+          </view>
+          <view class="column">
+            <view class="name">工单单号：</view>
+            <view class="value">{{workOrder.gdcode}}</view>
+          </view>
+          <view class="column">
+            <view class="name">任务类型：</view>
+            <view class="value">{{workOrder.taskType ? workOrder.taskType.taskName : ''}}</view>
+          </view>
+          <view class="column">
+            <view class="name">签到科室：</view>
+            <view class="value">{{queryObj.accountDeptName}}</view>
+          </view>
+          <view class="column" v-if="queryObj.accountName">
+            <view class="name">交接人：</view>
+            <view class="value">{{queryObj.accountName}}</view>
+          </view>
+          <template v-if="config.drugsModel === 1">
+            <view class="column">
+              <view class="name">药品数：</view>
+              <view class="value">{{drugsBagList.length ? drugsBagList[0].drugsCount : ''}}</view>
+            </view>
+            <view class="column">
+              <view class="name">药品单号：</view>
+              <view class="value">{{drugsBagList.length ? drugsBagList[0].batchNo : ''}}</view>
+            </view>
+          </template>
+          <template v-if="config.drugsModel === 2">
+            <view class="column">
+              <view class="name">药单数：</view>
+              <view class="value">{{drugsBagList.length}}</view>
+            </view>
+          </template>
+          <view class="column top">
+            <view class="name">留存照片：</view>
+            <view class="value flex1">
+              <uni-file-picker ref="handlerImgRef" file-mediatype="image" v-model="imgList" limit="1" @success="handlerImgSuccess" @fail="handlerImgFail" @select="handlerImgSelect" @delete="handlerImgDelete"></uni-file-picker>
+              <text class="imgTips">(支持JPG/PNG格式图片，单张大小10M以内)</text>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <view class="foot_btn_spe">
+      <view class="column">
+        <view class="btn" @click="goBack()">返回</view>
+        <view class="btn" @click="completeOrder()">提交</view>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+  import { uploadFile } from '@/tools/uploadFile.js'
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "@/http/http.js";
+  export default {
+    data() {
+      return {
+        imgList: [],//图片列表
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        queryObj: {}, //路由传递过来的数据
+        drugsBagList: [], //药包列表
+        drugsList: [], //药品列表
+        workOrder: {}, //工单信息
+        config: {}, //配置
+      };
+    },
+    methods: {
+      // 返回
+      goBack(){
+       uni.navigateBack();
+      },
+      // 工单完成
+      completeOrder(){
+        if(!this.imgList.length){
+          uni.showToast({
+            icon: 'none',
+            title: '请上传留存照片！'
+          });
+          return;
+        }
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        if(this.imgList.length){
+          // 有图片
+          this.$refs.handlerImgRef.upload();
+        }else{
+          // 没有图片
+          let handlerOrder$ = this.handlerOrder();
+          let requestList = [handlerOrder$];
+          Promise.all(requestList).then(resList => {
+            uni.hideLoading();
+            console.log(resList);
+            if(resList[0].state == 200){
+              uni.showToast({
+                icon: "none",
+                title: this.workOrder.gdState.value == 4 ? "交接成功，请尽快送达科室！" : (this.workOrder.gdState.value == 5 ? "交接成功，完成配送！" : ""),
+                duration: 60000,
+                mask: true,
+                complete(){
+                  setTimeout(() => {
+                    uni.hideToast();
+                    uni.redirectTo({
+                      url: `/pages/receiptpage/receiptpage`,
+                    });
+                  }, 2000)
+                }
+              });
+            }else{
+              uni.showToast({
+                icon: 'none',
+                title: resList[0].msg || '请求数据失败！'
+              });
+            }
+          })
+        }
+      },
+      // 工单完成接口
+      handlerOrder(){
+        let postData = {
+          "type": this.queryObj.drugsBagType,
+          "orderId": this.workOrder.id,
+          "handover": this.queryObj.accountId ? +this.queryObj.accountId : undefined,
+        };
+        return post('/transflow/checkComplete', postData);
+      },
+      // 处理图片
+      handlerOrderImg(imgObj){
+        return uploadFile(imgObj, this.workOrder.gdState.value == 4 ? 'drugsBagStartCheck' : 'drugsBagEndCheck', this.workOrder.id)
+      },
+      // 上传报修图片成功
+      handlerImgSuccess(e){
+        this.imgList.forEach(v => {
+          v.url = v.path;
+        })
+        console.log(this.imgList);
+
+        let handlerOrder$ = this.handlerOrder();
+        let requestList = [handlerOrder$];
+        this.imgList.forEach(v => {
+          let handlerOrderImg$ = this.handlerOrderImg(v);
+          requestList.push(handlerOrderImg$);
+        })
+
+        Promise.all(requestList).then(resList => {
+          uni.hideLoading();
+          console.log(resList);
+          if(resList[0].state == 200){
+            uni.showToast({
+              icon: "none",
+              title: this.workOrder.gdState.value == 4 ? "交接成功，请尽快送达科室！" : (this.workOrder.gdState.value == 5 ? "交接成功，完成配送！" : ""),
+              duration: 60000,
+              mask: true,
+              complete(){
+                setTimeout(() => {
+                  uni.hideToast();
+                  uni.redirectTo({
+                    url: `/pages/receiptpage/receiptpage`,
+                  });
+                }, 2000)
+              }
+            });
+          }else{
+            uni.showToast({
+              icon: 'none',
+              title: resList[0].msg || '请求数据失败！'
+            });
+          }
+        })
+      },
+
+      // 上传报修图片失败
+      handlerImgFail(e){
+        this.imgList.forEach(v => {
+          v.url = v.path;
+        })
+        console.log(this.imgList);
+      },
+      // 选择上传图片
+      handlerImgSelect(e){
+        this.imgList = this.imgList.concat(e.tempFiles);
+        console.log(this.imgList);
+      },
+      // 删除上传图片
+      handlerImgDelete(e){
+        this.imgList = this.imgList.filter(v => e.tempFile.uuid != v.uuid);
+        console.log(this.imgList);
+      },
+      // 初始化
+      init(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+
+        let info$ = post(`/transflow/extra`, {type: this.queryObj.drugsBagType, extraType: 'orderInfo', orderId: +this.queryObj.orderId});
+        let config$ = post(`/simple/data/fetchDataList/taskTypeConfig`, {
+            "idx": 0,
+            "sum": 1,
+            "taskTypeConfig": {
+                "taskTypeDTO": {
+                    "hosId": {
+                        "id": this.hosId
+                    },
+                    "ordinaryField": {
+                        "key": "ordinary_field",
+                        "value": this.queryObj.drugsBagType
+                    }
+                }
+            }
+        });
+
+        Promise.all([info$, config$]).then(result => {
+          uni.hideLoading();
+          let [info, config] = result || [];
+
+          if(info.state == 200){
+            if(info.data){
+              this.drugsBagList = info.data.drugsBagList || [];
+              if(Array.isArray(info.data.workOrder.endDepts)){
+                info.data.workOrder.endDeptNames = info.data.workOrder.endDepts.map(v => v.dept).join();
+              }
+              this.workOrder = info.data.workOrder || {};
+            }
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: info.msg || "接口获取数据失败！",
+            });
+          }
+
+          if(config.status == 200){
+            let list  = config.list || [];
+            this.config = list.length ? list[0] : {};
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: config.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+    },
+    onLoad(options) {
+      console.log(options, "options");
+      this.queryObj = options;
+      this.init();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    background: #FAFBFD;
+    padding: 0 24rpx;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+
+    .Scanning_top {
+      margin: 32rpx auto;
+      .Scanning_top_icon {
+        font-size: 28rpx;
+        font-weight: bold;
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      .scrollContent{
+        flex: 1;
+        min-height: 0;
+      }
+      .content{
+        border: 1rpx solid #C5C5C5;
+        background: #FFFFFF;
+        padding: 32rpx;
+        .dept{
+          font-size: 30rpx;
+          font-weight: bold;
+          .newicon{
+            margin: 0 32rpx;
+          }
+        }
+        .column{
+          display: flex;
+          align-items: center;
+          font-size: 30rpx;
+          margin-top: 32rpx;
+          &.top{
+            align-items: flex-start;
+          }
+          .name{
+            font-weight: bold;
+            word-break: break-all;
+            flex-shrink: 0;
+          }
+          .value{
+            word-break: break-all;
+            &.flex1{
+              flex: 1;
+              flex-shrink: 0;
+            }
+            .imgTips{
+              font-size: 22rpx;
+              color: #8E8E8E;
+            }
+          }
+        }
+      }
+    }
+
+    .foot_btn_spe {
+      margin: 24rpx 0;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 24rpx;
+      font-weight: bold;
+
+      .column{
+        width: 100%;
+        height: 78rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 24rpx;
+
+        .btn {
+          height: 100%;
+          flex: 1;
+          background: linear-gradient( 90deg, #6FC073 0%, #3DB197 100%);
+          color: #fff;
+          border-radius: 4rpx;
+          font-size: 30rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+    }
+  }
+</style>

pages/receiptpage/receiptpage.vue

@@ -212,11 +212,18 @@
                 </view>
                 <view class="line"></view>
               </view>
+              <view class="page_item_conts" v-else-if="item.taskType.associationType.value == 'ordinary' && (item.taskType.ordinaryField.value == 'drugsJpbag' || item.taskType.ordinaryField.value == 'drugsWestern' || item.taskType.ordinaryField.value == 'drugsReturn' || item.taskType.ordinaryField.value == 'drugsPoison' || item.taskType.ordinaryField.value == 'drugsHerbal')">
+                <view v-if="item.overdueTime">{{ item.overdueTime }}前送达</view>
+                <view style="word-break: break-all;" v-if="item.workOrderRemark">
+                  备注信息 :
+                  <text>{{ item.workOrderRemark || "暂无" }}</text>
+                </view>
+                <view class="line"></view>
+              </view>
               <view class="page_item_conts" v-else>
                 <view v-if="item.overdueTime">{{ item.overdueTime }}前送达</view>
 								<view>
-								  预约时间 : {{ item.yyjdTime | yyTimeFilter
-								  }}
+								  预约时间 : {{ item.yyjdTime | yyTimeFilter}}
 								</view>
                 <view style="word-break: break-all;" v-if="item.workOrderRemark">
                   备注信息 :
@@ -303,12 +310,12 @@
               <!-- 领血证 -->
               <view class="page_item_btn" @click="certificatHandler(item)" hover-class="seimin-btn-hover" v-if="useTakeCode == 1">领血证</view>
             </view>
-            
+
             <!-- 如果是万能交接-被服洗涤送回 -->
             <view class="page_item_btn" v-if="item.taskType.associationType.value == 'ordinary' && item.taskType.ordinaryField.value == 'clothingSend' && item.gdState.value == 5" hover-class="seimin-btn-hover">
               <view class="page_item_btn" @click="goToWashingEnd(item)" hover-class="seimin-btn-hover">核对被服</view>
             </view>
-            
+
             <view class="page_item_btn" v-if="selectedLabelSlots == '待接单'" @click="showAlerts(item)" hover-class="seimin-btn-hover">接单</view>
           </view>
           <view class="L-l"></view>
@@ -379,7 +386,7 @@
 								</view>
 							</view>
 						</view>
-						
+
 						<view class="execFilterItem">
 							<view class="execFilterItemHeader">
 								申请科室
@@ -388,7 +395,7 @@
 								<input class="deptName" @click="searchAdm" v-model.trim="deptName" placeholder="请选择科室名称" placeholder-style="color:#cecece" />
 							</view>
 						</view>
-						
+
 						<view class="execFilterItem">
 							<view class="execFilterItemHeader">
 								任务类型
@@ -400,7 +407,7 @@
 							</view>
 						</view>
 					</view>
-					
+
 					<view class="execFilterFooter">
 						<view class="btn" @click="execFilterReset()">重置</view>
 						<view class="btn" @click="execFilterOk()">完成</view>
@@ -412,13 +419,13 @@
     <!-- 被服洗涤弹窗 -->
     <showModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content"
       @ok="ok1" @cancel="cancel1" :operate="models1.operate"></showModel>
-      
+
     <!-- 父级科室弹窗 -->
     <showModel :title="models2.title" icon="" :disjunctor="models2.disjunctor" :content="models2.content" @ok="ok2" @cancel="cancel2" :operate="models2.operate" :childrenDeptList="models2.list"></showModel>
-    
+
     <!-- 父级科室弹窗 -->
     <showModel :title="models3.title" icon="" :disjunctor="models3.disjunctor" :content="models3.content" @know="know3" @ok="ok3" @cancel="cancel3" :operate="models3.operate" :busyContentList="models3.list"></showModel>
-    
+
     <!-- 示闲弹窗 -->
     <showModel :title="models4.title" icon="models4.icon" :disjunctor="models4.disjunctor" :content="models4.content" @know="know4" @ok="ok4" @cancel="cancel4" :operate="models4.operate"></showModel>
 		<scanner></scanner>
@@ -680,7 +687,7 @@
 										this.isNumberKey = false
 									}
 								}else if(i.key=='numberDigitalSecretKey'){
-									this.keyNum = Number(i.value) 
+									this.keyNum = Number(i.value)
 								}
 							}
 							for(let i = 0; i < this.keyNum; i++){
@@ -745,7 +752,7 @@
 			  if (accountObj) {
 			    list.handover = [accountObj.accountId];
 			  }
-			
+
 			  post("/workerOrder/" + type, list).then((res) => {
 			    console.log(this.tabType)
 			    uni.hideLoading();
@@ -1118,7 +1125,7 @@
             title: '未设置其他临床服务业务类型！'
           })
         }
-        
+
         this.getBloodPageConfig()
         this.waitingOrdersGetNum();
         this.executingOrders(0);
@@ -1762,7 +1769,7 @@
         if (this.currentCode) {
           let gdStateValue = data.gdState.value; //工单状态value
           let associationTypeValue = data.taskType.associationType.value; //关联类型value
-          
+
           // 其他临床服务，并且工单状态是待到达||工单状态待送达
           if (
             (associationTypeValue == "other" &&
@@ -2501,7 +2508,7 @@
                     });
                   }
                 });
-                
+
               } else {
                 uni.hideLoading();
                 uni.showToast({
@@ -2661,25 +2668,25 @@
           idx,
           sum: 20,
         };
-        
+
         if (this.currentId) {
           data.keyWord = this.currentId;
         } else {
           delete data.keyWord;
         }
-        
+
         if (this.deptId) {
           data.deptId = this.deptId;
         } else {
           delete data.deptId;
         }
-        
+
 				if (this.taskTypeId) {
 				  data.taskTypeId = this.taskTypeId;
 				} else {
 				  delete data.taskTypeId;
 				}
-				
+
         uni.showLoading({
           title: "加载中",
           mask: true,
@@ -2727,13 +2734,13 @@
 				} else {
 				  delete data.deptId;
 				}
-				
+
 				if (this.taskTypeId) {
 				  data.taskTypeId = this.taskTypeId;
 				} else {
 				  delete data.taskTypeId;
 				}
-				
+
         uni.showLoading({
           title: "加载中",
           mask: true,
@@ -3008,12 +3015,12 @@
 	/deep/ .selected-item-active{
 		border-bottom: 4rpx solid #49b856;
 	}
-	
+
   .Receiptpage {
     width: 100%;
     height: 100%;
     position: relative;
-    
+
     .execFilterMask{
       // position: fixed;
       // top: 0;
@@ -3024,14 +3031,14 @@
       // background-color: rgba(0, 0, 0, 0.5);
       // display: flex;
       // flex-direction: column;
-      // justify-content: flex-end;      
-      
+      // justify-content: flex-end;
+
       .execFilter{
         position: relative;
         background-color: #fff;
         height: 100vh;
         border-radius: 100rpx 100rpx 0 0;
-        
+
         .execFilterHeader{
           height: 70rpx;
           display: flex;
@@ -3039,7 +3046,7 @@
           align-items: center;
           border-bottom: 2rpx solid #ccc;
         }
-        
+
         .execFilterBody{
           .execFilterItem{
             padding: 32rpx;
@@ -3054,7 +3061,7 @@
               padding: 32rpx 0 0;
               justify-content: space-between;
               text-align: left;
-              
+
               .execFilterItemBox{
                 width: 200rpx;
                 height: 80rpx;
@@ -3068,7 +3075,7 @@
                   background-color: #49b856;
                 }
               }
-              
+
               .deptName {
                 height: 80rpx;
                 background-color: #f6f6f6;
@@ -3079,7 +3086,7 @@
             }
           }
         }
-        
+
         .execFilterFooter {
           position: absolute;
           bottom: 0;
@@ -3089,7 +3096,7 @@
           height: 100rpx;
           display: flex;
           justify-content: space-between;
-        
+
           .btn {
             height: 66rpx;
             flex: 1;
@@ -3104,7 +3111,7 @@
         }
       }
     }
-    
+
     .more {
       position: absolute;
       right: 20rpx;
@@ -3119,7 +3126,7 @@
       top: 50%;
       transform: translateY(-50%);
     }
-    
+
     .more_picker {
       position: absolute;
       right: 0;
@@ -3128,7 +3135,7 @@
       opacity: 0;
       z-index: 9999;
     }
-    
+
     .bigScreenWrap{
       position: fixed;
       left: 0;
@@ -3307,20 +3314,20 @@
                 line-height: 88rpx;
                 display: flex;
                 align-items: center;
-                
+
                 .emergencys {
                   background: #ff3b53 !important;
                   width: 124rpx !important;
                 }
-                
+
                 .emergency {
                   background: #ff3b53 !important;
                 }
-                
+
                 .emergency1 {
                   background: #49b856 !important;
                 }
-                
+
                 .page_item_cont_start {
                   text-align: center;
                   height: 44rpx;
@@ -3329,7 +3336,7 @@
                   border-radius: 8rpx;
                   background: #49b856;
                   color: #fff;
-                
+
                   .page_item_cont_start-img {
                     width: 22rpx;
                     position: relative;

readme.md

@@ -5,4 +5,23 @@
 - 被服洗涤 quiltWashing
 
 # 宜昌中心医院有二级目录，打包的时候需要修改配置
-- manifest.json文件需要修改h5.router.base，代码已注释
+- manifest.json文件需要修改h5.router.base，代码已注释
+
+# iconfont下载后路径前添加前缀，如下：
+```js
+@font-face {
+  font-family: "newicon"; /* Project id 4304849 */
+  src: url('iconfont.woff2?t=1728893186075') format('woff2'),
+       url('iconfont.woff?t=1728893186075') format('woff'),
+       url('iconfont.ttf?t=1728893186075') format('truetype');
+}
+```
+改成
+```js
+@font-face {
+  font-family: "newicon"; /* Project id 4304849 */
+  src: url('~@/static/font/iconfont.woff2?t=1728893186075') format('woff2'),
+       url('~@/static/font/iconfont.woff?t=1728893186075') format('woff'),
+       url('~@/static/font/iconfont.ttf?t=1728893186075') format('truetype');
+}
+```

tools/uploadFile.js

@@ -0,0 +1,67 @@
+import { api_uploadAttachment } from "@/http/http.js"
+/**
+ * 压缩
+ */
+const toBlob = (canvas, imgObj) => {
+  return new Promise((resolve,reject) => {
+    canvas.toBlob((fileSrc) => {
+      resolve(fileSrc)
+    }, `${imgObj.fileType}/${imgObj.extname}`, 0.3)
+  })
+}
+/**
+ * 图片加载完成
+ */
+const newImage = (img) => {
+  return new Promise((resolve,reject) => {
+    img.onload = () => {
+      resolve()
+    }
+  })
+}
+/**
+ * 上传图片
+ */
+export const uploadFile = async (imgObj, type, incidentId) => {
+  console.log('44444', type)
+  if(imgObj.extname=='mp4' || imgObj.extname=='avi' || imgObj.extname=='mpeg' ||
+    imgObj.extname=='wmv' || imgObj.extname=='mov' || imgObj.extname=='3gp' ||
+    imgObj.extname=='flv' || imgObj.extname=='mkv'){
+    return uni.uploadFile({
+      url: api_uploadAttachment(type, incidentId),
+      filePath: imgObj.path,
+      name: 'file',
+      formData: {
+        'filename': imgObj.name
+      }
+    })
+  }else{
+    const res1 = await uni.getImageInfo({src: imgObj.url});
+    const res = res1[1];
+    console.log('压缩前', res)
+    let canvasWidth = res.width //图片原始长宽
+    let canvasHeight = res.height
+    let img = new Image()
+    img.src = res.path
+    let canvas = document.createElement('canvas');
+    let ctx = canvas.getContext('2d')
+    canvas.width = canvasWidth
+    canvas.height = canvasHeight
+    await newImage(img)
+    ctx.drawImage(img, 0, 0, canvasWidth, canvasHeight)
+
+    const fileSrc = await toBlob(canvas, imgObj)
+    let tp = window.URL.createObjectURL(fileSrc)
+    console.log('压缩后', tp);
+    return uni.uploadFile({
+      timeout: 600000,
+      url: api_uploadAttachment(type, incidentId),
+      filePath: tp,
+      name: 'file',
+      formData: {
+        'filename': imgObj.name
+      }
+    });
+  }
+
+}