标本药品功能优化

components/bigScreen/bigScreen.vue

@@ -2,6 +2,10 @@
   <view class="toolbar" @click="Scanning()" hover-class="seimin-btn-hover">
     <text class="toolbar-icon icon_transport transport-saoma"></text>
     <text class="toolbar-sao">扫一扫</text>
+    <!-- 填写交接人账号弹窗 -->
+    <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+      @cancel="hosCancel">
+    </selectAccount>
   </view>
 </template>
 
@@ -13,11 +17,156 @@
   export default {
     data() {
       return {
+        // 填写交接人账号弹窗model
+        hosModels: {
+          disjunctor: false,
+        },
+        userId: {
+          ids: [],
+        },
+        workData: [],
+        infoDATA: {},
+        tabType: "", //当前选中项
+        selectArr: [], //选中项
+        code: "",
         currentCode: '', //当前小扫描的科室二维码
         SMFlag: true,
       }
     },
     methods: {
+      // 填写交接人账号-确认
+      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.orderDeptHandler(false, data);
+      },
+      // 填写交接人账号-取消
+      hosCancel() {
+        this.hosModels.disjunctor = false;
+        this.flag = true;
+      },
+      // 填写交接人账号弹窗
+      showSelectAccount() {
+        this.hosModels = {
+          title: "填写交接人账号",
+          disjunctor: true,
+        };
+      },
+      //科室签到
+      //trueBigScanner----判断是否大扫描
+      //bigScanner----判断是否需要交接人
+      //accountObj----弹窗填写的交接人信息
+      orderDeptHandler(bigScanner, accountObj) {
+        let type = "orderSign/" + this.code;
+        let list = {
+          ids: this.userId.ids,
+          trueBigScanner: ['666']
+        };
+        bigScanner && (list.bigScanner = ['666']);
+        if (accountObj) {
+          list.handover = [accountObj.accountId];
+        }
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/workerOrder/" + type, list).then((res) => {
+          console.log(this.tabType)
+          uni.hideLoading();
+          if (res.status == 200) {
+            if (this.tabType == 'specimenPlan') {
+              // -----------------------------
+              console.log(this.selectArr, '选中工单')
+              let gd = this.infoDATA.specimenPlan.find(v => v.id == this.selectArr[0]);
+              let startDeptId = gd.startDept.id; //起点科室id
+              let isDigitalHandover = gd.taskType.isDigitalHandover; //是否数字交接开关
+              let signDeptId = res.deptId; //签到的科室id
+              let gdId = gd.id;
+              let gdState = gd.gdState.value;
+              let endDepts = gd.endDepts.map(v => v.id).toString();
+              uni.navigateTo({
+                url: `../scanning_djEnd/scanning_djEnd?type=${
+                  this.tabType
+                }&type1=${res.type}&code=${this.code}&dept=${
+                  res.dept
+                }&ids=${encodeURIComponent(
+                  JSON.stringify(this.userId.ids)
+                )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}&startDeptId=${startDeptId}&isDigitalHandover=${isDigitalHandover}&signDeptId=${signDeptId}&gdId=${gdId}&gdState=${gdState}&endDepts=${endDepts}`,
+              });
+            } else if (this.tabType == 'specimen') {
+              if (res.deptType && res.deptType.value === 'middleRoom') {
+                // 如果是中转科室
+                uni.navigateTo({
+                  url: `../checkAfterBigScreen/checkAfterBigScreen?type=${
+                  this.tabType
+                }&type1=${res.type}&code=${this.code}&dept=${
+                  res.dept
+                }&ids=${encodeURIComponent(
+                  JSON.stringify(this.userId.ids)
+                )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}`,
+                });
+              } else {
+                uni.navigateTo({
+                  url: `../scanning_djEnd/scanning_djEnd?type=${
+                  this.tabType
+                }&type1=${res.type}&code=${this.code}&dept=${
+                  res.dept
+                }&ids=${encodeURIComponent(
+                  JSON.stringify(this.userId.ids)
+                )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}`,
+                });
+              }
+            }
+          } else if (res.status == "0000") {
+            this.showSelectAccount();
+          } else {
+            this.flag = true;
+            uni.navigateTo({
+              url: `../scanning_djEnd/scanning_djEnd?type=${this.tabType}&type1=${
+              res.type
+            }&code=${this.code}&dept=${res.dept}&ids=${encodeURIComponent(
+              JSON.stringify(this.userId.ids)
+            )}&model=${encodeURIComponent(JSON.stringify(res))}&deptId=${res.deptId}`,
+            });
+          }
+        });
+      },
       // 底部扫描
       Scanning() {
         if (!this.SMFlag) {
@@ -99,11 +248,27 @@
                         // 扫描科室码
                         // code: data.code //二维码
                         let infoDATA = res.data;
-                        uni.navigateTo({
-                          url: `../scanning_all/scanning_all?infoDATA=${encodeURIComponent(
-                          JSON.stringify(infoDATA)
-                        )}&code=${data.code}`,
-                        });
+                        console.log(infoDATA)
+                        // 判断是否是标本配送，并且仅仅只有这一种业务类型，默认全选,并跳转到下一步;
+                        // 判断是否是标本轮巡 ，并且仅仅只有这一种业务类型，并且只有一个工单，默认选中,并跳转到下一步;
+                        if(Object.keys(infoDATA).length === 1 && (infoDATA.specimen || (infoDATA.specimenPlan && infoDATA.specimenPlan.length === 1))){
+                          this.infoDATA = infoDATA;
+                          this.workData = infoDATA.specimen || infoDATA.specimenPlan;
+                          this.tabType = infoDATA.specimen ? 'specimen' : 'specimenPlan';
+                          this.code = data.code;
+                          this.selectArr = [];
+                          for (var i = 0; i < this.workData.length; i++) {
+                            this.selectArr.push(this.workData[i].id);
+                          }
+                          this.userId.ids = this.selectArr;
+                          this.orderDeptHandler(true);
+                        }else{
+                          uni.navigateTo({
+                            url: `../scanning_all/scanning_all?infoDATA=${encodeURIComponent(
+                            JSON.stringify(infoDATA)
+                          )}&code=${data.code}`,
+                          });
+                        }
                       } else if (res.type == 'drugsBag') {
                         //扫药包码
                         uni.navigateTo({

components/changeSpeNum/changeSpeNum.vue

@@ -57,7 +57,7 @@
       return {
         imageValue: [], //图片列表
         speNum: 0, //修改后的数量
-        reason: undefined, //修改原因
+        reason: '标本\n单子\n其他', //修改原因
         loading: false,
         userData: null,
         hosId: null,

main.js

@@ -4,7 +4,7 @@ import App from './App'
 import wx from 'weixin-jsapi'
 // import VConsole from 'vconsole';
 // new VConsole();
-console.info('v2.4.12');
+console.info('v2.4.13');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages/checkAfterBigScreen/checkAfterBigScreen.vue

@@ -12,7 +12,7 @@
           <view class="text_big" @click="goToSpeDetail()"><text class="underline">{{info.total}}</text>只</view>
         </view>
         <view class="page_item_cont_title">
-          <view> 临床科室 </view>
+          <view class="text_title"> 临床科室 </view>
           <view class="text_big">{{info.LCDept}}</view>
         </view>
         <view class="page_item_cont_title2">
@@ -215,6 +215,11 @@
       padding: 0 20rpx;
       text-align: left;
       position: relative;
+      
+      .text_title{
+        flex-shrink: 0;
+        margin-right: 16rpx;
+      }
 
       .text_big {
         font-size: 32rpx;

pages/checkAfterScanning/checkAfterScanning.vue

@@ -8,7 +8,7 @@
           <view class="text_big">{{info.gdCode}}</view>
         </view>
         <view class="page_item_cont_title">
-          <view> 科室名称 </view>
+          <view class="text_title"> 科室名称 </view>
           <view class="text_big">{{info.LCDept}}</view>
         </view>
         <view class="page_item_cont_title">
@@ -166,16 +166,18 @@
               content =
                 `您在<strong class="red">${ress.deptName}</strong>检验科扫描了<strong class="red">${ress.deptScanNum}</strong>个标本，还需扫描<strong class="red">${ress.deptNotScanNum}</strong>标本。`;
             }
-            this.models2 = {
-              disjunctor: true,
-              title: "提示",
-              content,
-              icon: "warn",
-              operate: {
-                ok: "确定",
-                cancel: "取消",
-              },
-            };
+            // 取消弹窗 2022年10月10日
+            this.ok2();
+            // this.models2 = {
+            //   disjunctor: true,
+            //   title: "提示",
+            //   content,
+            //   icon: "warn",
+            //   operate: {
+            //     ok: "确定",
+            //     cancel: "取消",
+            //   },
+            // };
           } else {
             uni.showToast({
               icon: "none",
@@ -309,6 +311,11 @@
       padding: 0 20rpx;
       text-align: left;
       position: relative;
+      
+      .text_title{
+        flex-shrink: 0;
+        margin-right: 16rpx;
+      }
 
       .text_big {
         font-size: 32rpx;

pages/receiptpage/receiptpage.vue

@@ -81,6 +81,9 @@
                   {{ item.emergencyType.name }}
                 </view>
               </view>
+              <view class="page_item_conts" v-if="item.taskType.associationType.value == 'specimen'">
+                <view>扫描标本数量 : {{ item.actualReceiveNum || '无'}}</view>
+              </view>
               <view class="page_item_conts" v-if="item.taskType.associationType.value == 'inspect'">
                 <view>
                   预约时间 : {{ item.yyTime | yyTimeFilter
@@ -1158,7 +1161,7 @@
                 min-height: 80rpx;
                 max-height: 324rpx;
                 font-size: 28rpx;
-                padding-top: 16rpx;
+                margin-top: 16rpx;
 
                 .page_item_cont_title {
                   height: 100%;
@@ -1186,7 +1189,7 @@
 
               .page_item_conts {
                 color: rgb(102, 102, 102);
-                padding-left: 18%;
+                padding-left: 50rpx;
                 font-size: 28rpx;
 
                 view {
@@ -1203,7 +1206,7 @@
               }
 
               .page_item_cont_B {
-                padding-top: 20rpx;
+                // padding-top: 20rpx;
                 font-size: 28rpx;
                 overflow: hidden;
 

pages/scanning/scanning.vue

@@ -6,7 +6,7 @@
       </view>
       <view class="Scanning_top_text">
         <view class="text1"> 扫描完成 </view>
-        <view class="text2" v-if="queryObj.content" v-html="queryObj.content"></view>
+        <view class="text2" v-if="queryObj.content && queryObj.type !== 'specimenPlan'" v-html="queryObj.content"></view>
         <view class="text2" v-if="!queryObj.content">
           您已在
           <text style="font-weight: 600; color: rgb(73, 184, 86)" v-if="
@@ -36,6 +36,23 @@
           <text>扫描<text style="color: #ff3b53">{{ speNum }}</text> 个标本,
             确认是否继续配送或是完成工单。</text>
         </view>
+        <template v-if="queryObj.type === 'specimenPlan'">
+          <table class="speTable">
+            <tr>
+              <td>科室名称</td>
+              <td>数量</td>
+              <td>状态</td>
+            </tr>
+            <tr v-for="spe in infoList" :key="spe[0]">
+              <td class="maxWidth">{{spe[1]}}</td>
+              <td>{{spe[2]}}</td>
+              <td>
+                <text v-if="spe[3] === 'ysd'" class="green">已到达</text>
+                <text v-if="spe[3] === 'wsd'" class="red">未到达</text>
+              </td>
+            </tr>
+          </table>
+        </template>
       </view>
     </view>
     <view class="foot_btn1 footerPadding">
@@ -75,6 +92,7 @@
   export default {
     data() {
       return {
+        infoList:[],
         // 弹窗model
         models: {
           disjunctor: false,
@@ -91,6 +109,29 @@
       };
     },
     methods: {
+      // 获取标本轮巡核对信息
+      getInfo() {
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        let postData = {
+          startDept: this.queryObj.startDeptId,
+          targetDept: this.queryObj.targetDeptId,
+          uuid: this.dataId[0]
+        };
+        post(`/api/getDeptSpecimensNum`, postData).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            this.infoList = res.data;
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+      },
       // 继续配送
       Scanning_again(id) {
         uni.navigateTo({
@@ -217,6 +258,7 @@
       if (options.speNum) {
         this.speNum = options.speNum;
       }
+      this.getInfo();
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif
@@ -226,9 +268,29 @@
     },
   };
 </script>
-<style lang="less">
+<style lang="less" scoped>
   .Scanning {
     padding: 0 20rpx;
+    
+    // 标本轮巡核对 start
+    .speTable {
+      margin: 32rpx 0;
+      width: 100%;
+      border-collapse: collapse;
+      .green{
+        color: green;
+      }
+      .red{
+        color: red;
+      }
+      .maxWidth{
+        width: 60%;
+      }
+      td{
+        border: 2rpx solid #666;
+      }
+    }
+    // 标本轮巡核对 end
 
     .Scanning_top {
       height: 340rpx;

pages/scanning_Result/scanning_Result.vue

@@ -581,16 +581,18 @@
               content =
                 `您在<strong class="red">${ress.deptName}</strong>检验科扫描了<strong class="red">${ress.deptScanNum}</strong>个标本，还需扫描<strong class="red">${ress.deptNotScanNum}</strong>标本。`;
             }
-            this.models2 = {
-              disjunctor: true,
-              title: "提示",
-              content,
-              icon: "warn",
-              operate: {
-                ok: "确定",
-                cancel: "取消",
-              },
-            };
+            // 取消弹窗 2022年10月10日
+            this.ok2();
+            // this.models2 = {
+            //   disjunctor: true,
+            //   title: "提示",
+            //   content,
+            //   icon: "warn",
+            //   operate: {
+            //     ok: "确定",
+            //     cancel: "取消",
+            //   },
+            // };
           } else {
             uni.showToast({
               icon: "none",

pages/scanning_code/scanning_code.vue

@@ -463,78 +463,66 @@
             console.log(imageValue);
             if (!imageValue.length) {
               uni.hideLoading();
-              uni.showModal({
-                title: "提示",
-                content: "修改成功！",
-                showCancel: false,
-                success: (result) => {
-                  if (result.confirm) {
-                    console.log("用户点击确定");
-                    if (this.changeSpeObj.t == "big") {
-                      if (this.changeSpeObj.gdState == 4) {
-                        // 待到达
-                        uni.navigateTo({
-                          url: `../../pages/receiptpage/receiptpage`,
-                        });
-                      } else if (this.changeSpeObj.gdState == 5) {
-                        // 待送达
-                        if (res.type1 === "plan-spe-ddd-2") {} else {
-                          let content = `本工单已签到<strong class="red">${
-                          res.scanSet ? res.scanSet.join("、") : ""
-                        }</strong>，剩余需签到科室<strong class="red">${
-                          res.notScanSet ? res.notScanSet.join("、") : ""
-                        }</strong>，您确定完成工单吗？`;
-                          uni.navigateTo({
-                            url: `../scanning/scanning?type=${res.type}&type1=${
-                            res.type1
-                          }&id=${encodeURIComponent(
-                            JSON.stringify([res.gdid])
-                          )}&content=${content}`,
-                          });
-                        }
-                      }
-                    } else if (this.changeSpeObj.t == "small") {
-                      if (this.changeSpeObj.id == "undefined") {
-                        //快捷建单建单进入
-                        uni.navigateTo({
-                          url: `../../pages/receiptpage/receiptpage`,
-                        });
-                      } else {
-                        if (this.changeSpeObj.gdState == 4) {
-                          // 待到达
-                          uni.navigateTo({
-                            url: `../../pages/receiptpage/receiptpage`,
-                          });
-                        } else if (this.changeSpeObj.gdState == 5) {
-                          // 待送达
-                          if (res.type1 === "plan-spe-ddd-2") {} else {
-                            let content = `本工单已签到<strong class="red">${
-                            res.scanSet ? res.scanSet.join("、") : ""
-                          }</strong>，剩余需签到科室<strong class="red">${
-                            res.notScanSet ? res.notScanSet.join("、") : ""
-                          }</strong>，您确定完成工单吗？`;
-                            uni.navigateTo({
-                              url: `../scanning/scanning?type=${res.type}&type1=${
-                              res.type1
-                            }&id=${encodeURIComponent(
-                              JSON.stringify([res.gdid])
-                            )}&content=${content}`,
-                            });
-                          }
-                        }
-                      }
-                    } else {
+              if (this.changeSpeObj.t == "big") {
+                if (this.changeSpeObj.gdState == 4) {
+                  // 待到达
+                  uni.navigateTo({
+                    url: `../../pages/receiptpage/receiptpage`,
+                  });
+                } else if (this.changeSpeObj.gdState == 5) {
+                  // 待送达
+                  if (res.type1 === "plan-spe-ddd-2") {} else {
+                    let content = `本工单已签到<strong class="red">${
+                    res.scanSet ? res.scanSet.join("、") : ""
+                  }</strong>，剩余需签到科室<strong class="red">${
+                    res.notScanSet ? res.notScanSet.join("、") : ""
+                  }</strong>，您确定完成工单吗？`;
+                    uni.navigateTo({
+                      url: `../scanning/scanning?type=${res.type}&type1=${
+                      res.type1
+                    }&id=${encodeURIComponent(
+                      JSON.stringify([res.gdid])
+                    )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                    });
+                  }
+                }
+              } else if (this.changeSpeObj.t == "small") {
+                if (this.changeSpeObj.id == "undefined") {
+                  //快捷建单建单进入
+                  uni.navigateTo({
+                    url: `../../pages/receiptpage/receiptpage`,
+                  });
+                } else {
+                  if (this.changeSpeObj.gdState == 4) {
+                    // 待到达
+                    uni.navigateTo({
+                      url: `../../pages/receiptpage/receiptpage`,
+                    });
+                  } else if (this.changeSpeObj.gdState == 5) {
+                    // 待送达
+                    if (res.type1 === "plan-spe-ddd-2") {} else {
+                      let content = `本工单已签到<strong class="red">${
+                      res.scanSet ? res.scanSet.join("、") : ""
+                    }</strong>，剩余需签到科室<strong class="red">${
+                      res.notScanSet ? res.notScanSet.join("、") : ""
+                    }</strong>，您确定完成工单吗？`;
                       uni.navigateTo({
-                        url: `../../pages/specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
-                        JSON.stringify(this.changeSpeObj.infoDATA)
-                      )}`,
+                        url: `../scanning/scanning?type=${res.type}&type1=${
+                        res.type1
+                      }&id=${encodeURIComponent(
+                        JSON.stringify([res.gdid])
+                      )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
                       });
                     }
-                  } else if (result.cancel) {
-                    console.log("用户点击取消");
                   }
-                },
-              });
+                }
+              } else {
+                uni.navigateTo({
+                  url: `../../pages/specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
+                  JSON.stringify(this.changeSpeObj.infoDATA)
+                )}`,
+                });
+              }
               return;
             }
             let n = 0;
@@ -569,78 +557,66 @@
                       console.log(uploadFileRes);
                       if (--n === 0) {
                         uni.hideLoading();
-                        uni.showModal({
-                          title: "提示",
-                          content: "修改成功！",
-                          showCancel: false,
-                          success: (result) => {
-                            if (result.confirm) {
-                              console.log("用户点击确定", this.changeSpeObj.t);
-                              if (this.changeSpeObj.t == "big") {
-                                if (this.changeSpeObj.gdState == 4) {
-                                  // 待到达
-                                  uni.navigateTo({
-                                    url: `../../pages/receiptpage/receiptpage`,
-                                  });
-                                } else if (this.changeSpeObj.gdState == 5) {
-                                  // 待送达
-                                  if (res.type1 === "plan-spe-ddd-2") {} else {
-                                    let content = `本工单已签到<strong class="red">${
-                                    res.scanSet ? res.scanSet.join("、") : ""
-                                  }</strong>，剩余需签到科室<strong class="red">${
-                                    res.notScanSet ? res.notScanSet.join("、") : ""
-                                  }</strong>，您确定完成工单吗？`;
-                                    uni.navigateTo({
-                                      url: `../scanning/scanning?type=${res.type}&type1=${
-                                      res.type1
-                                    }&id=${encodeURIComponent(
-                                      JSON.stringify([res.gdid])
-                                    )}&content=${content}`,
-                                    });
-                                  }
-                                }
-                              } else if (this.changeSpeObj.t == "small") {
-                                if (this.changeSpeObj.id == "undefined") {
-                                  //快捷建单建单进入
-                                  uni.navigateTo({
-                                    url: `../../pages/receiptpage/receiptpage`,
-                                  });
-                                } else {
-                                  if (this.changeSpeObj.gdState == 4) {
-                                    // 待到达
-                                    uni.navigateTo({
-                                      url: `../../pages/receiptpage/receiptpage`,
-                                    });
-                                  } else if (this.changeSpeObj.gdState == 5) {
-                                    // 待送达
-                                    if (res.type1 === "plan-spe-ddd-2") {} else {
-                                      let content = `本工单已签到<strong class="red">${
-                                      res.scanSet ? res.scanSet.join("、") : ""
-                                    }</strong>，剩余需签到科室<strong class="red">${
-                                      res.notScanSet ? res.notScanSet.join("、") : ""
-                                    }</strong>，您确定完成工单吗？`;
-                                      uni.navigateTo({
-                                        url: `../scanning/scanning?type=${res.type}&type1=${
-                                        res.type1
-                                      }&id=${encodeURIComponent(
-                                        JSON.stringify([res.gdid])
-                                      )}&content=${content}`,
-                                      });
-                                    }
-                                  }
-                                }
-                              } else {
+                        if (this.changeSpeObj.t == "big") {
+                          if (this.changeSpeObj.gdState == 4) {
+                            // 待到达
+                            uni.navigateTo({
+                              url: `../../pages/receiptpage/receiptpage`,
+                            });
+                          } else if (this.changeSpeObj.gdState == 5) {
+                            // 待送达
+                            if (res.type1 === "plan-spe-ddd-2") {} else {
+                              let content = `本工单已签到<strong class="red">${
+                              res.scanSet ? res.scanSet.join("、") : ""
+                            }</strong>，剩余需签到科室<strong class="red">${
+                              res.notScanSet ? res.notScanSet.join("、") : ""
+                            }</strong>，您确定完成工单吗？`;
+                              uni.navigateTo({
+                                url: `../scanning/scanning?type=${res.type}&type1=${
+                                res.type1
+                              }&id=${encodeURIComponent(
+                                JSON.stringify([res.gdid])
+                              )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                              });
+                            }
+                          }
+                        } else if (this.changeSpeObj.t == "small") {
+                          if (this.changeSpeObj.id == "undefined") {
+                            //快捷建单建单进入
+                            uni.navigateTo({
+                              url: `../../pages/receiptpage/receiptpage`,
+                            });
+                          } else {
+                            if (this.changeSpeObj.gdState == 4) {
+                              // 待到达
+                              uni.navigateTo({
+                                url: `../../pages/receiptpage/receiptpage`,
+                              });
+                            } else if (this.changeSpeObj.gdState == 5) {
+                              // 待送达
+                              if (res.type1 === "plan-spe-ddd-2") {} else {
+                                let content = `本工单已签到<strong class="red">${
+                                res.scanSet ? res.scanSet.join("、") : ""
+                              }</strong>，剩余需签到科室<strong class="red">${
+                                res.notScanSet ? res.notScanSet.join("、") : ""
+                              }</strong>，您确定完成工单吗？`;
                                 uni.navigateTo({
-                                  url: `../../pages/specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
-                                  JSON.stringify(this.changeSpeObj.infoDATA)
-                                )}`,
+                                  url: `../scanning/scanning?type=${res.type}&type1=${
+                                  res.type1
+                                }&id=${encodeURIComponent(
+                                  JSON.stringify([res.gdid])
+                                )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
                                 });
                               }
-                            } else if (result.cancel) {
-                              console.log("用户点击取消");
                             }
-                          },
-                        });
+                          }
+                        } else {
+                          uni.navigateTo({
+                            url: `../../pages/specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
+                            JSON.stringify(this.changeSpeObj.infoDATA)
+                          )}`,
+                          });
+                        }
                       }
                     },
                     fail: (err) => {

pages/scanning_djEnd/scanning_djEnd.vue

@@ -287,7 +287,7 @@
           title: "加载中",
         });
         let postData = {
-          checkDept: this.changeSpeObj.endDepts, //终点科室
+          checkDept: this.queryObj.endDepts, //终点科室
           transDeptId: this.changeSpeObj.infoDATA.startDept,
           gdId: this.changeSpeObj.infoDATA.uuid,
           deptId: this.changeSpeObj.id == "undefined" ?
@@ -300,78 +300,66 @@
             console.log(imageValue);
             if (!imageValue.length) {
               uni.hideLoading();
-              uni.showModal({
-                title: "提示",
-                content: "修改成功！",
-                showCancel: false,
-                success: (result) => {
-                  if (result.confirm) {
-                    console.log("用户点击确定");
-                    if (this.changeSpeObj.t == "big") {
-                      if (this.changeSpeObj.gdState == 4) {
-                        // 待到达
-                        uni.navigateTo({
-                          url: `../../pages/receiptpage/receiptpage`,
-                        });
-                      } else if (this.changeSpeObj.gdState == 5) {
-                        // 待送达
-                        if (res.type1 === "plan-spe-ddd-2") {} else {
-                          let content = `本工单已签到<strong class="red">${
-                          res.scanSet ? res.scanSet.join("、") : ""
-                        }</strong>，剩余需签到科室<strong class="red">${
-                          res.notScanSet ? res.notScanSet.join("、") : ""
-                        }</strong>，您确定完成工单吗？`;
-                          uni.navigateTo({
-                            url: `../scanning/scanning?type=${res.type}&type1=${
-                            res.type1
-                          }&id=${encodeURIComponent(
-                            JSON.stringify([res.gdid])
-                          )}&content=${content}`,
-                          });
-                        }
-                      }
-                    } else if (this.changeSpeObj.t == "small") {
-                      if (this.changeSpeObj.id == "undefined") {
-                        //快捷建单建单进入
-                        uni.navigateTo({
-                          url: `../../pages/receiptpage/receiptpage`,
-                        });
-                      } else {
-                        if (this.changeSpeObj.gdState == 4) {
-                          // 待到达
-                          uni.navigateTo({
-                            url: `../../pages/receiptpage/receiptpage`,
-                          });
-                        } else if (this.changeSpeObj.gdState == 5) {
-                          // 待送达
-                          if (res.type1 === "plan-spe-ddd-2") {} else {
-                            let content = `本工单已签到<strong class="red">${
-                            res.scanSet ? res.scanSet.join("、") : ""
-                          }</strong>，剩余需签到科室<strong class="red">${
-                            res.notScanSet ? res.notScanSet.join("、") : ""
-                          }</strong>，您确定完成工单吗？`;
-                            uni.navigateTo({
-                              url: `../scanning/scanning?type=${res.type}&type1=${
-                              res.type1
-                            }&id=${encodeURIComponent(
-                              JSON.stringify([res.gdid])
-                            )}&content=${content}`,
-                            });
-                          }
-                        }
-                      }
-                    } else {
+              if (this.changeSpeObj.t == "big") {
+                if (this.changeSpeObj.gdState == 4) {
+                  // 待到达
+                  uni.navigateTo({
+                    url: `../../pages/receiptpage/receiptpage`,
+                  });
+                } else if (this.changeSpeObj.gdState == 5) {
+                  // 待送达
+                  if (res.type1 === "plan-spe-ddd-2") {} else {
+                    let content = `本工单已签到<strong class="red">${
+                    res.scanSet ? res.scanSet.join("、") : ""
+                  }</strong>，剩余需签到科室<strong class="red">${
+                    res.notScanSet ? res.notScanSet.join("、") : ""
+                  }</strong>，您确定完成工单吗？`;
+                    uni.navigateTo({
+                      url: `../scanning/scanning?type=${res.type}&type1=${
+                      res.type1
+                    }&id=${encodeURIComponent(
+                      JSON.stringify([res.gdid])
+                    )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                    });
+                  }
+                }
+              } else if (this.changeSpeObj.t == "small") {
+                if (this.changeSpeObj.id == "undefined") {
+                  //快捷建单建单进入
+                  uni.navigateTo({
+                    url: `../../pages/receiptpage/receiptpage`,
+                  });
+                } else {
+                  if (this.changeSpeObj.gdState == 4) {
+                    // 待到达
+                    uni.navigateTo({
+                      url: `../../pages/receiptpage/receiptpage`,
+                    });
+                  } else if (this.changeSpeObj.gdState == 5) {
+                    // 待送达
+                    if (res.type1 === "plan-spe-ddd-2") {} else {
+                      let content = `本工单已签到<strong class="red">${
+                      res.scanSet ? res.scanSet.join("、") : ""
+                    }</strong>，剩余需签到科室<strong class="red">${
+                      res.notScanSet ? res.notScanSet.join("、") : ""
+                    }</strong>，您确定完成工单吗？`;
                       uni.navigateTo({
-                        url: `../../pages/specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
-                        JSON.stringify(this.changeSpeObj.infoDATA)
-                      )}`,
+                        url: `../scanning/scanning?type=${res.type}&type1=${
+                        res.type1
+                      }&id=${encodeURIComponent(
+                        JSON.stringify([res.gdid])
+                      )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
                       });
                     }
-                  } else if (result.cancel) {
-                    console.log("用户点击取消");
                   }
-                },
-              });
+                }
+              } else {
+                uni.navigateTo({
+                  url: `../../pages/specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
+                  JSON.stringify(this.changeSpeObj.infoDATA)
+                )}`,
+                });
+              }
               return;
             }
             let n = 0;
@@ -432,7 +420,7 @@
                                       res.type1
                                     }&id=${encodeURIComponent(
                                       JSON.stringify([res.gdid])
-                                    )}&content=${content}`,
+                                    )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
                                     });
                                   }
                                 }
@@ -461,7 +449,7 @@
                                         res.type1
                                       }&id=${encodeURIComponent(
                                         JSON.stringify([res.gdid])
-                                      )}&content=${content}`,
+                                      )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
                                       });
                                     }
                                   }
@@ -840,16 +828,18 @@
                 content =
                   `您在<strong class="red">${ress.deptName}</strong>检验科扫描了<strong class="red">${ress.deptScanNum}</strong>个标本，还需扫描<strong class="red">${ress.deptNotScanNum}</strong>标本。`;
               }
-              this.models2 = {
-                disjunctor: true,
-                title: "提示",
-                content,
-                icon: "warn",
-                operate: {
-                  ok: "确定",
-                  cancel: "取消",
-                },
-              };
+              // 取消弹窗 2022年10月10日
+              this.ok2();
+              // this.models2 = {
+              //   disjunctor: true,
+              //   title: "提示",
+              //   content,
+              //   icon: "warn",
+              //   operate: {
+              //     ok: "确定",
+              //     cancel: "取消",
+              //   },
+              // };
             } else {
               uni.showToast({
                 icon: "none",

pages/scanning_djInfo/scanning_djInfo.vue

@@ -498,16 +498,18 @@
               content =
                 `您在<strong class="red">${ress.deptName}</strong>检验科扫描了<strong class="red">${ress.deptScanNum}</strong>个标本，还需扫描<strong class="red">${ress.deptNotScanNum}</strong>标本。`;
             }
-            this.models2 = {
-              disjunctor: true,
-              title: "提示",
-              content,
-              icon: "warn",
-              operate: {
-                ok: "确定",
-                cancel: "取消",
-              },
-            };
+            // 取消弹窗 2022年10月10日
+            this.ok2();
+            // this.models2 = {
+            //   disjunctor: true,
+            //   title: "提示",
+            //   content,
+            //   icon: "warn",
+            //   operate: {
+            //     ok: "确定",
+            //     cancel: "取消",
+            //   },
+            // };
           } else {
             uni.showToast({
               icon: "none",

pages/scanning_drug/scanning_drug.vue

@@ -77,10 +77,13 @@
       <view class="L-l"></view>
       <view class="R-l"></view>
     </view>
-    <button class="cube-toolbar-item" v-show="isShowBtn" @click="buildOrderAndSign()">
+    <button class="cube-toolbar-item" v-show="isShowBtn" @click="receiveOrderAndSign()">
       接单并签到
     </button>
-    <button class="cube-toolbar-item" v-show="!isShowBtn" @click="goBack()">
+    <button class="cube-toolbar-item" v-show="!workOrder.id" @click="buildOrderAndSign()">
+      建单并签到
+    </button>
+    <button class="cube-toolbar-item" v-show="!isShowBtn && workOrder.id" @click="goBack()">
       知道了
     </button>
     <!-- 弹窗 -->
@@ -339,7 +342,7 @@
         this.gotoFlag = true;
       },
       // 接单并签到
-      buildOrderAndSign() {
+      receiveOrderAndSign() {
         if (!this.gotoFlag) {
           return;
         }
@@ -364,6 +367,52 @@
           }
         }
       },
+      // 建单并签到
+      buildOrderAndSign() {
+        if (!this.gotoFlag) {
+          return;
+        }
+        this.gotoFlag = false;
+        uni.showModal({
+          title: "提示",
+          content: "请确认是否建单并签到？",
+          success: (result) => {
+            if (result.confirm) {
+              console.log("用户点击确定");
+              let postData = {
+                packId: this.drugsBagDto.packid,
+              };
+              uni.showLoading({
+                title: "加载中",
+                mask: true,
+              });
+              post("/workerOrder/drugBagReceiving", postData).then((ress) => {
+                uni.hideLoading();
+                if (ress.status == 200) {
+                  let info = {
+                    targetDept: ress.data.target.dept, //所属科室
+                    packid: ress.data.packid, //药包编码
+                    status: ress.status,
+                    msg: ress.msg,
+                  };
+                  uni.navigateTo({
+                    url: `../scanning_result_seimin/scanning_result_seimin?info=${encodeURIComponent(
+                    JSON.stringify(info)
+                  )}`,
+                  });
+                } else {
+                  uni.showToast({
+                    icon: "none",
+                    title: "请求失败！",
+                  });
+                }
+              });
+            } else if (result.cancel) {
+              console.log("用户点击取消");
+            }
+          },
+        });
+      },
       //获取药包信息及其关联的工单信息
       queryDrugsBagForId(drugsBagId) {
         uni.showLoading({
@@ -377,6 +426,7 @@
           if (res.status == 200) {
             this.drugsBagDto = res.drugsBagDto || {};
             this.workOrder = res.workOrder || {};
+            console.log(this.workOrder)
           } else {
             uni.showToast({
               icon: "none",

pages/specimenChecking/specimenChecking.vue

@@ -95,78 +95,66 @@
             console.log(imageValue);
             if (!imageValue.length) {
               uni.hideLoading();
-              uni.showModal({
-                title: "提示",
-                content: "修改成功！",
-                showCancel: false,
-                success: (result) => {
-                  if (result.confirm) {
-                    console.log("用户点击确定");
-                    if (this.changeSpeObj.t == "big") {
-                      if (this.changeSpeObj.gdState == 4) {
-                        // 待到达
-                        uni.navigateTo({
-                          url: `../../pages/receiptpage/receiptpage`,
-                        });
-                      } else if (this.changeSpeObj.gdState == 5) {
-                        // 待送达
-                        if (res.type1 === "plan-spe-ddd-2") {} else {
-                          let content = `本工单已签到<strong class="red">${
-                          res.scanSet ? res.scanSet.join("、") : ""
-                        }</strong>，剩余需签到科室<strong class="red">${
-                          res.notScanSet ? res.notScanSet.join("、") : ""
-                        }</strong>，您确定完成工单吗？`;
-                          uni.navigateTo({
-                            url: `../scanning/scanning?type=${res.type}&type1=${
-                            res.type1
-                          }&id=${encodeURIComponent(
-                            JSON.stringify([res.gdid])
-                          )}&content=${content}`,
-                          });
-                        }
-                      }
-                    } else if (this.changeSpeObj.t == "small") {
-                      if (this.changeSpeObj.id == "undefined") {
-                        //快捷建单建单进入
-                        uni.navigateTo({
-                          url: `../../pages/receiptpage/receiptpage`,
-                        });
-                      } else {
-                        if (this.changeSpeObj.gdState == 4) {
-                          // 待到达
-                          uni.navigateTo({
-                            url: `../../pages/receiptpage/receiptpage`,
-                          });
-                        } else if (this.changeSpeObj.gdState == 5) {
-                          // 待送达
-                          if (res.type1 === "plan-spe-ddd-2") {} else {
-                            let content = `本工单已签到<strong class="red">${
-                            res.scanSet ? res.scanSet.join("、") : ""
-                          }</strong>，剩余需签到科室<strong class="red">${
-                            res.notScanSet ? res.notScanSet.join("、") : ""
-                          }</strong>，您确定完成工单吗？`;
-                            uni.navigateTo({
-                              url: `../scanning/scanning?type=${res.type}&type1=${
-                              res.type1
-                            }&id=${encodeURIComponent(
-                              JSON.stringify([res.gdid])
-                            )}&content=${content}`,
-                            });
-                          }
-                        }
-                      }
-                    } else {
+              if (this.changeSpeObj.t == "big") {
+                if (this.changeSpeObj.gdState == 4) {
+                  // 待到达
+                  uni.navigateTo({
+                    url: `../../pages/receiptpage/receiptpage`,
+                  });
+                } else if (this.changeSpeObj.gdState == 5) {
+                  // 待送达
+                  if (res.type1 === "plan-spe-ddd-2") {} else {
+                    let content = `本工单已签到<strong class="red">${
+                    res.scanSet ? res.scanSet.join("、") : ""
+                  }</strong>，剩余需签到科室<strong class="red">${
+                    res.notScanSet ? res.notScanSet.join("、") : ""
+                  }</strong>，您确定完成工单吗？`;
+                    uni.navigateTo({
+                      url: `../scanning/scanning?type=${res.type}&type1=${
+                      res.type1
+                    }&id=${encodeURIComponent(
+                      JSON.stringify([res.gdid])
+                    )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                    });
+                  }
+                }
+              } else if (this.changeSpeObj.t == "small") {
+                if (this.changeSpeObj.id == "undefined") {
+                  //快捷建单建单进入
+                  uni.navigateTo({
+                    url: `../../pages/receiptpage/receiptpage`,
+                  });
+                } else {
+                  if (this.changeSpeObj.gdState == 4) {
+                    // 待到达
+                    uni.navigateTo({
+                      url: `../../pages/receiptpage/receiptpage`,
+                    });
+                  } else if (this.changeSpeObj.gdState == 5) {
+                    // 待送达
+                    if (res.type1 === "plan-spe-ddd-2") {} else {
+                      let content = `本工单已签到<strong class="red">${
+                      res.scanSet ? res.scanSet.join("、") : ""
+                    }</strong>，剩余需签到科室<strong class="red">${
+                      res.notScanSet ? res.notScanSet.join("、") : ""
+                    }</strong>，您确定完成工单吗？`;
                       uni.navigateTo({
-                        url: `../../pages/specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
-                        JSON.stringify(this.changeSpeObj.infoDATA)
-                      )}`,
+                        url: `../scanning/scanning?type=${res.type}&type1=${
+                        res.type1
+                      }&id=${encodeURIComponent(
+                        JSON.stringify([res.gdid])
+                      )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
                       });
                     }
-                  } else if (result.cancel) {
-                    console.log("用户点击取消");
                   }
-                },
-              });
+                }
+              } else {
+                uni.navigateTo({
+                  url: `../../pages/specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
+                  JSON.stringify(this.changeSpeObj.infoDATA)
+                )}`,
+                });
+              }
               return;
             }
             let n = 0;
@@ -227,7 +215,7 @@
                                       res.type1
                                     }&id=${encodeURIComponent(
                                       JSON.stringify([res.gdid])
-                                    )}&content=${content}`,
+                                    )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
                                     });
                                   }
                                 }
@@ -256,7 +244,7 @@
                                         res.type1
                                       }&id=${encodeURIComponent(
                                         JSON.stringify([res.gdid])
-                                      )}&content=${content}`,
+                                      )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
                                       });
                                     }
                                   }

pages/specimenCheckingDetail/specimenCheckingDetail.vue

@@ -404,78 +404,66 @@
             console.log(imageValue);
             if (!imageValue.length) {
               uni.hideLoading();
-              uni.showModal({
-                title: "提示",
-                content: "修改成功！",
-                showCancel: false,
-                success: (result) => {
-                  if (result.confirm) {
-                    console.log("用户点击确定");
-                    if (this.options.t == "big") {
-                      if (this.options.gdState == 4) {
-                        // 待到达
-                        uni.navigateTo({
-                          url: `../../pages/receiptpage/receiptpage`,
-                        });
-                      } else if (this.options.gdState == 5) {
-                        // 待送达
-                        if (res.type1 === "plan-spe-ddd-2") {} else {
-                          let content = `本工单已签到<strong class="red">${
-                          res.scanSet ? res.scanSet.join("、") : ""
-                        }</strong>，剩余需签到科室<strong class="red">${
-                          res.notScanSet ? res.notScanSet.join("、") : ""
-                        }</strong>，您确定完成工单吗？`;
-                          uni.navigateTo({
-                            url: `../scanning/scanning?type=${res.type}&type1=${
-                            res.type1
-                          }&id=${encodeURIComponent(
-                            JSON.stringify([res.gdid])
-                          )}&content=${content}`,
-                          });
-                        }
-                      }
-                    } else if (this.options.t == "small") {
-                      if (this.selectDeptId == "undefined") {
-                        //快捷建单建单进入
-                        uni.navigateTo({
-                          url: `../../pages/receiptpage/receiptpage`,
-                        });
-                      } else {
-                        if (this.options.gdState == 4) {
-                          // 待到达
-                          uni.navigateTo({
-                            url: `../../pages/receiptpage/receiptpage`,
-                          });
-                        } else if (this.options.gdState == 5) {
-                          // 待送达
-                          if (res.type1 === "plan-spe-ddd-2") {} else {
-                            let content = `本工单已签到<strong class="red">${
-                            res.scanSet ? res.scanSet.join("、") : ""
-                          }</strong>，剩余需签到科室<strong class="red">${
-                            res.notScanSet ? res.notScanSet.join("、") : ""
-                          }</strong>，您确定完成工单吗？`;
-                            uni.navigateTo({
-                              url: `../scanning/scanning?type=${res.type}&type1=${
-                              res.type1
-                            }&id=${encodeURIComponent(
-                              JSON.stringify([res.gdid])
-                            )}&content=${content}`,
-                            });
-                          }
-                        }
-                      }
-                    } else {
+              if (this.options.t == "big") {
+                if (this.options.gdState == 4) {
+                  // 待到达
+                  uni.navigateTo({
+                    url: `../../pages/receiptpage/receiptpage`,
+                  });
+                } else if (this.options.gdState == 5) {
+                  // 待送达
+                  if (res.type1 === "plan-spe-ddd-2") {} else {
+                    let content = `本工单已签到<strong class="red">${
+                    res.scanSet ? res.scanSet.join("、") : ""
+                  }</strong>，剩余需签到科室<strong class="red">${
+                    res.notScanSet ? res.notScanSet.join("、") : ""
+                  }</strong>，您确定完成工单吗？`;
+                    uni.navigateTo({
+                      url: `../scanning/scanning?type=${res.type}&type1=${
+                      res.type1
+                    }&id=${encodeURIComponent(
+                      JSON.stringify([res.gdid])
+                    )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
+                    });
+                  }
+                }
+              } else if (this.options.t == "small") {
+                if (this.selectDeptId == "undefined") {
+                  //快捷建单建单进入
+                  uni.navigateTo({
+                    url: `../../pages/receiptpage/receiptpage`,
+                  });
+                } else {
+                  if (this.options.gdState == 4) {
+                    // 待到达
+                    uni.navigateTo({
+                      url: `../../pages/receiptpage/receiptpage`,
+                    });
+                  } else if (this.options.gdState == 5) {
+                    // 待送达
+                    if (res.type1 === "plan-spe-ddd-2") {} else {
+                      let content = `本工单已签到<strong class="red">${
+                      res.scanSet ? res.scanSet.join("、") : ""
+                    }</strong>，剩余需签到科室<strong class="red">${
+                      res.notScanSet ? res.notScanSet.join("、") : ""
+                    }</strong>，您确定完成工单吗？`;
                       uni.navigateTo({
-                        url: `../../pages/specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
-                        JSON.stringify(this.msg)
-                      )}`,
+                        url: `../scanning/scanning?type=${res.type}&type1=${
+                        res.type1
+                      }&id=${encodeURIComponent(
+                        JSON.stringify([res.gdid])
+                      )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
                       });
                     }
-                  } else if (result.cancel) {
-                    console.log("用户点击取消");
                   }
-                },
-              });
+                }
+              } else {
+                uni.navigateTo({
+                  url: `../../pages/specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
+                  JSON.stringify(this.msg)
+                )}`,
+                });
+              }
               return;
             }
             let n = 0;
@@ -536,7 +524,7 @@
                                       res.type1
                                     }&id=${encodeURIComponent(
                                       JSON.stringify([res.gdid])
-                                    )}&content=${content}`,
+                                    )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
                                     });
                                   }
                                 }
@@ -565,7 +553,7 @@
                                         res.type1
                                       }&id=${encodeURIComponent(
                                         JSON.stringify([res.gdid])
-                                      )}&content=${content}`,
+                                      )}&content=${content}&startDeptId=${postData.transDeptId}&targetDeptId=${postData.checkDept}`,
                                       });
                                     }
                                   }