被服洗涤

components/selectNum/selectNum.vue

@@ -13,7 +13,7 @@
             {{dataName}}：
           </view>
           <view class="uni-list-cell-db">
-            <input class="uni-input" auto-focus="true" placeholder="请填写数量" type="number" v-model="num" @input="onKeyInput" />
+            <input class="uni-input" focus placeholder="请填写数量" type="number" v-model="num" @input="onKeyInput" />
           </view>
         </view>
       </view>
@@ -75,11 +75,7 @@
       },
       // 确定
       ok() {
-        let e = {};
-        if (this.num) {
-          e.num = this.num;
-        }
-        this.$emit("ok", e);
+        this.$emit("ok", {num: this.num || 0});
       },
       // 取消
       cancel() {
@@ -88,7 +84,7 @@
     },
     created() {
       this.hosId = uni.getStorageSync('userData').user.currentHospital.id;
-    }
+    },
   };
 </script>
 

pages.json

@@ -490,7 +490,20 @@
           "titleNView": false
         }
       }
-
+    }, {
+      "path": "pages/quiltWashing/quiltWashingException/quiltWashingException",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    }, {
+      "path": "pages/quiltWashing/quiltWashingSendSignIn/quiltWashingSendSignIn",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
     }
   ],
   "globalStyle": {

pages/quiltWashing/quiltWashingException/quiltWashingException.vue

@@ -0,0 +1,193 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-close icon_transport transport-chaoshi"></text>
+        <view class="text1"> {{queryObj.clothesTypeName}}-异常详情 </view>
+      </view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view class="Scanning_cont_list">
+        <scroll-view scroll-y="true" class="Scanning_cont_list_scroll">
+          <view class="Scanning_cont_list_item" v-for="(item, j) in dataList" :key="item.id">
+            <view class="row">
+              <view class="row_item">
+                调整数量：<text class="red">{{item.changeNum}}</text>
+              </view>
+              <view class="row_item">
+                原因：<text class="red">{{item.clothesExceptionRe ? item.clothesExceptionRe.name : ''}}</text>
+              </view>
+            </view>
+            <view class="row">
+              <view class="row_item">
+                备注：{{item.remarks}}
+              </view>
+            </view>
+            <view class="row">
+              <view class="row_item">
+                调整人：{{item.changerDTO ? item.changerDTO.name : ''}}
+              </view>
+              <view class="row_item">
+                调整时间：{{item.changeTime | formatDate('yyyy-MM-dd hh:mm:ss')}}
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+
+    <view class="foot_btn">
+      <view class="btn" @click="goBack()"> 返回 </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,
+        queryObj: {}, //路由传递过来的数据
+        dataList: [],
+        // 弹窗model
+        models1: {
+          disjunctor: false,
+        },
+      };
+    },
+    methods: {
+      goBack(){
+        uni.navigateBack();
+      },
+      getInfo(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/simple/data/fetchDataList/clothesException", {
+            "idx": 0,
+            "sum": 9999,
+            "clothesException": {
+                "hosId": this.hosId,
+                "batchId": this.queryObj.batchId,
+                "clothesType": {
+                  id: this.queryObj.clothesTypeId,
+                },
+                "clothesDept": this.queryObj.relatedDept,
+            }
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.status == 200) {
+            this.dataList = result.list || [];
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+    },
+    onLoad(options) {
+      console.log(options, "result");
+      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 {
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background-color: #fff;
+    .Scanning_top {
+      flex-shrink: 0;
+      .Scanning_top_icon {
+        padding-top: 26rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        .cubeic-ok {
+          font-size: 140rpx;
+          color: #35b34a;
+        }
+        
+        .cubeic-close {
+          font-size: 48rpx;
+          color: #ff3b53;
+        }
+
+        .text1 {
+          font-size: 48rpx;
+          font-weight: bold;
+        }
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      width: 710rpx;
+      margin: 0 20rpx;
+      
+      .Scanning_cont_list{
+        flex: 1;
+        min-height: 0;
+        display: flex;
+        flex-direction: column;
+        .Scanning_cont_list_scroll{
+          flex: 1;
+          min-height: 0;
+        }
+        .Scanning_cont_list_item{
+          margin-top: 15rpx;
+          padding: 30rpx;
+          font-size: 28rpx;
+          background-color: #FAFBFD;
+          .row{
+            display: flex;
+            justify-content: space-between;
+            margin-top: 20rpx;
+          }
+        }
+      }
+    }
+
+    .foot_btn {
+      flex-shrink: 0;
+      line-height: 66rpx;
+      display: flex;
+      justify-content: center;
+
+      .btn {
+        height: 66rpx;
+        flex: 1;
+        margin-right: 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 28rpx;
+        text-align: center;
+        &:last-of-type{
+          margin-right: 0;
+        }
+      }
+    }
+  }
+</style>

pages/quiltWashing/quiltWashingGetEndCheck/quiltWashingGetEndCheck.vue

@@ -18,7 +18,7 @@
           </view>
           <view class="value">
             <view>
-              被服种类数量<text class="red">({{total}})</text>
+              被服总数<text class="red">({{total}})</text>
             </view>
           </view>
         </view>
@@ -178,13 +178,13 @@
         align-items: center;
 
         .cubeic-ok {
-          font-size: 128rpx;
+          font-size: 140rpx;
           color: #35b34a;
         }
 
         .text1 {
           margin-top: 30rpx;
-          font-size: 38rpx;
+          font-size: 48rpx;
           font-weight: bold;
         }
       }
@@ -213,7 +213,7 @@
         border-bottom: 1rpx solid #EEEEEE;
         .Scanning_cont_head_item{
           flex: 1;
-          font-size: 24rpx;
+          font-size: 28rpx;
           font-weight: bold;
           display: flex;
           justify-content: center;
@@ -262,17 +262,17 @@
           height: 70rpx;
           display: flex;
           align-items: center;
-          font-size: 23rpx;
+          font-size: 28rpx;
           border-bottom: 1rpx solid #CCCCCC;
           &.Scanning_cont_list_head{
             font-weight: bold;
-            font-size: 24rpx;
+            font-size: 28rpx;
             border-bottom: none;
             flex-shrink: 0;
           }
           .name,
           .value{
-            padding: 0 67rpx;
+            padding: 0 40rpx;
             flex: 1;
           }
           .value {
@@ -287,18 +287,18 @@
 
     .foot_btn {
       flex-shrink: 0;
-      line-height: 64rpx;
+      line-height: 66rpx;
       display: flex;
       justify-content: center;
 
       .btn {
-        height: 64rpx;
+        height: 66rpx;
         flex: 1;
         margin-right: 1%;
         background-image: linear-gradient(to right, #72c172, #3bb197);
         color: #fff;
         border-radius: 8rpx;
-        font-size: 24rpx;
+        font-size: 28rpx;
         text-align: center;
         &:last-of-type{
           margin-right: 0;

pages/quiltWashing/quiltWashingGetSignIn/quiltWashingGetSignIn.vue

@@ -20,7 +20,7 @@
       <view class="Scanning_cont_list">
         <view class="Scanning_cont_list_item Scanning_cont_list_head">
           <view class="name">
-            被服种类
+            被服类型
           </view>
           <view class="value">
             <view>
@@ -114,7 +114,7 @@
           }else{
             uni.showToast({
               icon: "none",
-              title: result.msg || "接口获取数据失败！",
+              title: res.msg || "接口获取数据失败！",
             });
           }
         });
@@ -130,7 +130,7 @@
         this.models1 = {
           disjunctor: true,
           title: "提示",
-          content: `${this.queryObj.startDeptName}已与${this.queryObj.name}交接${num}件被服，交接人为${this.queryObj.name}，您确认交接吗？`,
+          content: `<strong class="red">${this.queryObj.startDeptName}</strong>已与<strong class="red">${this.queryObj.name}</strong>交接<strong class="red">${num}件</strong>被服，交接人为<strong class="red">${this.queryObj.name}</strong>，您确认交接吗？`,
           icon: "warn",
           operate: {
             ok: "确定",
@@ -219,12 +219,12 @@
         align-items: center;
 
         .cubeic-ok {
-          font-size: 48rpx;
+          font-size: 58rpx;
           color: #35b34a;
         }
 
         .text1 {
-          font-size: 38rpx;
+          font-size: 48rpx;
           font-weight: bold;
         }
       }
@@ -253,7 +253,7 @@
         border-bottom: 1rpx solid #EEEEEE;
         .Scanning_cont_head_item{
           flex: 1;
-          font-size: 24rpx;
+          font-size: 28rpx;
           font-weight: bold;
           display: flex;
           justify-content: center;
@@ -302,17 +302,17 @@
           height: 70rpx;
           display: flex;
           align-items: center;
-          font-size: 23rpx;
+          font-size: 28rpx;
           border-bottom: 1rpx solid #CCCCCC;
           &.Scanning_cont_list_head{
             font-weight: bold;
-            font-size: 24rpx;
+            font-size: 28rpx;
             border-bottom: none;
             flex-shrink: 0;
           }
           .name,
           .value{
-            padding: 0 67rpx;
+            padding: 0 40rpx;
             flex: 1;
           }
           .value {
@@ -327,18 +327,18 @@
 
     .foot_btn {
       flex-shrink: 0;
-      line-height: 64rpx;
+      line-height: 66rpx;
       display: flex;
       justify-content: center;
 
       .btn {
-        height: 64rpx;
+        height: 66rpx;
         flex: 1;
         margin-right: 1%;
         background-image: linear-gradient(to right, #72c172, #3bb197);
         color: #fff;
         border-radius: 8rpx;
-        font-size: 24rpx;
+        font-size: 28rpx;
         text-align: center;
         &:last-of-type{
           margin-right: 0;

pages/quiltWashing/quiltWashingSendSignIn/quiltWashingSendSignIn.vue

@@ -0,0 +1,333 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-ok icon_transport transport-duigou"></text>
+        <view class="text1"> 签到成功 </view>
+      </view>
+      <view class="Scanning_top_text">
+        您已到达{{queryObj.endDeptName}}，请核对填写以下物品数量
+      </view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view class="Scanning_cont_head">
+        <view class="Scanning_cont_head_item" :class="{active: parentIndex == i}" v-for="(item, i) in dataList" :key="item.id" @click="parentIndex = i">
+          {{item.name}}
+        </view>
+      </view>
+      
+      <view class="Scanning_cont_list">
+        <view class="Scanning_cont_list_item Scanning_cont_list_head">
+          <view class="name">
+            被服类型
+          </view>
+          <view class="value">
+            <view>
+              回收数量
+            </view>
+          </view>
+          <view class="value">
+            <view>
+              送回数量
+            </view>
+          </view>
+        </view>
+        <scroll-view scroll-y="true" class="Scanning_cont_list_scroll" v-if="dataList[parentIndex]">
+          <view class="Scanning_cont_list_item" @click="clickRow(item)" v-for="(item, j) in dataList[parentIndex].children" :key="item.id" :class="{red: item.clothesWashingDTO.exception == 1}">
+            <view class="name">
+              {{item.name}}
+            </view>
+            <view class="value">
+              <view>
+                {{item.clothesWashingDTO ? item.clothesWashingDTO.recyclingNum : ''}}
+              </view>
+            </view>
+            <view class="value">
+              <view>
+                {{item.clothesWashingDTO ? item.clothesWashingDTO.sendBackNum : ''}}
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+
+    <view class="foot_btn">
+      <view class="btn" @click="onClick()"> 核对完成 </view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "../../../http/http.js";
+  export default {
+    data() {
+      return {
+        SMFlag: true,
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        queryObj: {}, //路由传递过来的数据
+        dataList: [],
+        parentIndex: 0,
+      };
+    },
+    methods: {
+      onClick(){
+        this.quiltScan();
+      },
+      // 扫描工牌-被服洗涤
+      quiltScan() {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        SM().then((content) => {
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          //检验二维码的有效性(扫码前必须验证)
+          post("/dept/scanning", {
+              content,
+            })
+            .then((result) => {
+              let accountCode = result.code;
+              this.SMFlag = true;
+              // 200检测通过，201没有有效期也通过。
+              if (result.state == 200 || result.state == 201) {
+                let data = {
+                  code: accountCode, //二维码
+                };
+                post("/transflow/checkComplete", { 
+                    type: 'clothingSend',
+                    orderId: this.queryObj.orderId,
+                    code: accountCode,
+                  })
+                  .then((res) => {
+                    uni.hideLoading();
+                    if (res.data && res.data.state == 200) {
+                      uni.showModal({
+                        title: "提示",
+                        content: "操作成功",
+                        showCancel: false,
+                        success: (result) => {
+                          if (result.confirm) {
+                            console.log("用户点击确定");
+                            uni.navigateTo({
+                              url: `../../receiptpage/receiptpage`,
+                            });
+                          }
+                        },
+                      });
+                    } else {
+                      uni.navigateTo({
+                        url: `../../scanning_Result/scanning_Result?status=${res.data ? res.data.state : ''}&msg=${res.data ? res.data.msg : ''}&qrcode=${accountCode}`,
+                      });
+                    }
+                  });
+              } else {
+                uni.hideLoading();
+                uni.showToast({
+                  icon: "none",
+                  title: result.info || "接口获取数据失败！",
+                });
+              }
+            })
+        }).catch(err => {
+          this.SMFlag = true;
+        });
+      },
+      clickRow(data){
+        uni.navigateTo({
+          url: `../quiltWashingException/quiltWashingException?clothesTypeId=${data.id}&clothesTypeName=${data.name}&batchId=${data.clothesWashingDTO.batchId}&relatedDept=${data.clothesWashingDTO.relatedDept}`,
+        });
+      },
+      getInfo(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/transflow/scanInfo", {
+          type: 'clothingSend',
+          hosId: this.hosId,
+          endDeptId: this.queryObj.endDeptId,
+          orderId: this.queryObj.orderId,
+          id: 0,
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.state == 200) {
+            let dataList = result.data.treeList || [];
+            dataList.forEach(v => {
+              v.children = v.children.sort((a, b) => b.clothesWashingDTO.exception - a.clothesWashingDTO.exception)
+            })
+            console.log(dataList);
+            this.dataList = dataList.slice(0, 3);
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+    },
+    onLoad(options) {
+      console.log(options, "result");
+      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 {
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background-color: #fafbfd;
+    .Scanning_top {
+      flex-shrink: 0;
+      .Scanning_top_icon {
+        padding-top: 26rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        .cubeic-ok {
+          font-size: 58rpx;
+          color: #35b34a;
+        }
+
+        .text1 {
+          font-size: 48rpx;
+          font-weight: bold;
+        }
+      }
+      .Scanning_top_text{
+        text-align: center;
+        font-size: 28rpx;
+        font-weight: bold;
+        padding: 8rpx 0 23rpx 0;
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      width: 710rpx;
+      margin: 0 20rpx;
+      background-color: #fff;
+      
+      .Scanning_cont_head{
+        flex-shrink: 0;
+        height: 78rpx;
+        display: flex;
+        border-top: 1rpx solid #EEEEEE;
+        border-bottom: 1rpx solid #EEEEEE;
+        .Scanning_cont_head_item{
+          flex: 1;
+          font-size: 28rpx;
+          font-weight: bold;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          position: relative;
+          &.active{
+            color: #49B856;
+            &::before{
+              content: '';
+              width: 70rpx;
+              height: 10rpx;
+              background-color: #49B856;
+              position: absolute;
+              left: 50%;
+              bottom: 0;
+              transform: translateX(-50%);
+              border-radius: 6rpx;
+            }
+          }
+          &::after{
+            content: '';
+            width: 2rpx;
+            height: 44rpx;
+            background-color: #D1D1D1;
+            position: absolute;
+            right: 0;
+            top: 50%;
+            transform: translateY(-50%);
+          }
+          &:last-of-type::after{
+            opacity: 0;
+          }
+        }
+      }
+      
+      .Scanning_cont_list{
+        flex: 1;
+        min-height: 0;
+        display: flex;
+        flex-direction: column;
+        .Scanning_cont_list_scroll{
+          flex: 1;
+          min-height: 0;
+        }
+        .Scanning_cont_list_item{
+          height: 70rpx;
+          display: flex;
+          align-items: center;
+          font-size: 28rpx;
+          border-bottom: 1rpx solid #CCCCCC;
+          &.Scanning_cont_list_head{
+            font-weight: bold;
+            font-size: 28rpx;
+            border-bottom: none;
+            flex-shrink: 0;
+          }
+          .name,
+          .value{
+            padding: 0 10rpx;
+            flex: 1;
+          }
+          .value {
+            view{
+              width: 4em;
+              text-align: center;
+            }
+          }
+        }
+      }
+    }
+
+    .foot_btn {
+      flex-shrink: 0;
+      line-height: 66rpx;
+      display: flex;
+      justify-content: center;
+
+      .btn {
+        height: 66rpx;
+        flex: 1;
+        margin-right: 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 28rpx;
+        text-align: center;
+        &:last-of-type{
+          margin-right: 0;
+        }
+      }
+    }
+  }
+</style>

pages/receiptpage/receiptpage.vue

@@ -244,6 +244,16 @@
               <!-- 待送达 -->
               <text class="red" v-if="item.gdState.value == 5">请扫描终点科室码，并扫描患者腕带</text>
             </view>
+            <view v-if="item.taskType.associationType.value == 'ordinary' && item.taskType.ordinaryField.value == 'clothingGet'">
+              <!-- 待送达 -->
+              <text class="red" v-if="item.gdState.value == 5">请扫描终点科室二维码</text>
+            </view>
+            <view v-if="item.taskType.associationType.value == 'ordinary' && item.taskType.ordinaryField.value == 'clothingSend'">
+              <!-- 待到达 -->
+              <text class="red" v-if="item.gdState.value == 4">请扫描起点科室二维码</text>
+              <!-- 待送达 -->
+              <text class="red" v-if="item.gdState.value == 5">请扫描终点科室二维码</text>
+            </view>
             <view v-else-if="item.taskType.associationType.value == 'other'">
               <!-- 待到达 -->
               <text class="red" v-if="item.gdState.value == 4 && item.taskType.carryingCourses[0].checkoutMethod.value == 1">可通过扫描科室码或者拍照进行签到</text>
@@ -286,6 +296,11 @@
               <view class="page_item_btn" @click="goTobloodEnd(item)" hover-class="seimin-btn-hover">送达交接</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>
@@ -541,6 +556,11 @@
           url: `../endOrderSignBlood/endOrderSignBlood?orderIds=${order.id}&deptName=${order.endDepts[0].dept}&deptId=${order.endDepts[0].id}&type=delivery`,
         });
       },
+      goToWashingEnd(order){
+        uni.navigateTo({
+          url: `../quiltWashing/quiltWashingSendSignIn/quiltWashingSendSignIn?orderId=${order.id}&endDeptId=${order.endDepts[0].id}&endDeptName=${order.endDepts[0].dept}`,
+        });
+      },
       async initList(){
         uni.showLoading({
           title: "加载中",
@@ -1475,7 +1495,7 @@
           hosId: this.hosId,
         }).then((res) => {
           uni.hideLoading();
-          if (res.state == 200) {
+          if (res.data && res.data.state == 200) {
             uni.showModal({
               title: "提示",
               content: "建单成功",
@@ -1492,7 +1512,7 @@
           }else{
             uni.showToast({
               icon: "none",
-              title: result.msg || "接口获取数据失败！",
+              title: res.data ? res.data.msg : "接口获取数据失败！",
             });
           }
         });

pages/scanning_all/scanning_all.vue

@@ -493,9 +493,29 @@
               uni.navigateTo({
                 url: `../quiltWashing/quiltWashingGetEndCheck/quiltWashingGetEndCheck?orderIds=${this.userId.ids.toString()}&endDeptName=${this.deptName}`
               })
-            }else if (this.tabType == "clothingSend") {
-              // todo
-            }else if (
+            } else if (this.tabType == "clothingSend") {
+              let postData = {
+                ids: this.userId.ids,
+                type: 'clothingSend',
+              };
+              uni.showLoading({
+                title: "加载中",
+                mask: true,
+              });
+              post("/transflow/bigScan", postData).then((res) => {
+                uni.hideLoading();
+                if (res.status == 200) {
+                  uni.navigateTo({
+                    url: "../receiptpage/receiptpage",
+                  });
+                } else {
+                  uni.showToast({
+                    icon: "none",
+                    title: res.msg || "接口获取数据失败！",
+                  });
+                }
+              });
+            } else if (
               this.tabType == "drugsBag" ||
               this.tabType == "jPBag" ||
               this.tabType == "other" ||