被服

components/showModel/showModel.vue

@@ -5,7 +5,7 @@
         {{ title }}
         <text v-if="operate.know == '知道了' && timerFlag">({{ time }})</text>
       </view>
-      <view class="showModel__article" :class="{ p0: textareaFlag, p1: radioInspectionDistanceItem.length }">
+      <view class="showModel__article" :class="{ p0: textareaFlag, p1: radioInspectionDistanceItem.length, p2: childrenDeptList.length }">
         <text
           v-if="icon"
           class="showModel__icon icon_transport"
@@ -46,6 +46,9 @@
             </view>
           </radio-group>
         </view>
+        <view class="childrenDeptList" v-if="childrenDeptList.length">
+          <view @click="clickHandler(item)" v-for="(item, index) in childrenDeptList" :key="item.id" class="childrenDeptItem">{{ item.dept }}</view>
+        </view>
       </view>
       <view class="showModel__footer">
         <view
@@ -162,6 +165,13 @@ export default {
         return [];
       },
     },
+    // 子科室列表
+    childrenDeptList: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
     // 操作按钮文字
     operate: {
       type: Object,
@@ -173,6 +183,10 @@ export default {
     },
   },
   methods: {
+    clickHandler(item){
+      console.log(item);
+      this.$emit('ok', item)
+    },
     // 单选框选中
     radioChange(item){
       this.$emit('radioChange',item.target.value)
@@ -245,9 +259,9 @@ export default {
 
     .showModel__article {
       color: #000;
-      margin: 40rpx auto 25rpx;
+      margin: 0 auto 25rpx;
       width: 488rpx;
-      padding: 60rpx 0;
+      padding: 60rpx 16rpx;
       background-color: rgb(249, 250, 251);
       border: 2rpx solid rgb(229, 233, 237);
       border-radius: 12rpx;
@@ -256,6 +270,7 @@ export default {
       flex-direction: column;
       justify-content: center;
       align-items: center;
+      text-align: justify;
       &.p0 {
         padding: 0;
       }
@@ -263,6 +278,26 @@ export default {
       &.p1 {
         text-align: left;
       }
+      
+      &.p2 {
+        text-indent: 2em;
+      }
+      
+      .childrenDeptList{
+        width: 100%;
+        max-height: 50vh;
+        overflow-y: auto;
+        .childrenDeptItem{
+          background-color: #fff;
+          height: 80rpx;
+          border-radius: 80rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          color: #49b856;
+          margin-top: 24rpx;
+        }
+      }
 
       .showModel__icon {
         font-size: 138rpx;

main.js

@@ -7,7 +7,7 @@ import './mixins/mixin'
 // new VConsole();
 // import eruda from 'eruda';
 // eruda.init();
-console.info('v2.4.47');
+console.info('v2.4.48');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages/quiltWashing/quiltWashingGetEndCheck/quiltWashingGetEndCheck.vue

@@ -84,23 +84,13 @@
         }).then((res) => {
           uni.hideLoading();
           if (res.state == 200) {
-            uni.showModal({
-              title: "提示",
-              content: "操作成功",
-              showCancel: false,
-              success: (result) => {
-                if (result.confirm) {
-                  console.log("用户点击确定");
-                  uni.navigateTo({
-                    url: `../../receiptpage/receiptpage`,
-                  });
-                }
-              },
+            uni.navigateTo({
+              url: `../../receiptpage/receiptpage`,
             });
           }else{
             uni.showToast({
               icon: "none",
-              title: result.msg || "接口获取数据失败！",
+              title: res.msg || "接口获取数据失败！",
             });
           }
         });

pages/quiltWashing/quiltWashingGetSignIn/quiltWashingGetSignIn.vue

@@ -52,6 +52,9 @@
     <!-- 弹窗 -->
     <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="models2.icon" :disjunctor="models2.disjunctor" :content="models2.content"
+      @ok="ok2" @cancel="cancel2" :operate="models2.operate"></showModel>
   </view>
 </template>
 <script>
@@ -77,10 +80,60 @@
         models1: {
           disjunctor: false,
         },
+        // 弹窗model
+        models2: {
+          disjunctor: false,
+        },
       };
     },
     methods: {
       //确定
+      ok2() {
+        this.models2.disjunctor = false;
+        let bussList = this.dataList.map(v => v.children).flat().map(v => v.clothesWashingDTO).map(v => ({...v, exception: 0, recyclingNum: 0,}));
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/transflow/createOrTakeOrder", {
+          type: 'clothingGet',
+          id: 0,
+          startDeptId: this.queryObj.startDeptId,
+          hosId: this.hosId,
+          bussList,
+          orderId: this.queryObj.orderId,
+        }).then((res) => {
+          uni.hideLoading();
+          if (res.state == 200) {
+            uni.navigateTo({
+              url: `../../receiptpage/receiptpage`,
+            });
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      //取消
+      cancel2() {
+        this.models2.disjunctor = false;
+      },
+      // 弹窗
+      showModel2() {
+        this.models2 = {
+          disjunctor: true,
+          title: "提示",
+          content: `<strong class="red">${this.queryObj.startDeptName}</strong>无需填写回收数量，您确认吗？`,
+          icon: "warn",
+          operate: {
+            ok: "确定",
+            cancel: "取消",
+          },
+        };
+      },
+      //确定
       ok1() {
         this.models1.disjunctor = false;
         let bussList = this.dataList.map(v => v.children).flat().map(v => v.clothesWashingDTO).map(v => ({...v, exception: 0}));
@@ -98,18 +151,8 @@
         }).then((res) => {
           uni.hideLoading();
           if (res.state == 200) {
-            uni.showModal({
-              title: "提示",
-              content: "交接成功",
-              showCancel: false,
-              success: (result) => {
-                if (result.confirm) {
-                  console.log("用户点击确定");
-                  uni.navigateTo({
-                    url: `../../receiptpage/receiptpage`,
-                  });
-                }
-              },
+            uni.navigateTo({
+              url: `../../receiptpage/receiptpage`,
             });
           }else{
             uni.showToast({
@@ -127,10 +170,16 @@
       showModel1() {
         let bussList = this.dataList.map(v => v.children).flat();
         let num = bussList.reduce((prev, current) => prev + current.clothesWashingDTO.recyclingNum, 0);
+        let content = '';
+        if(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>，您确认交接吗？`;
+        }else{
+          content = `<strong class="red">${this.queryObj.startDeptName}</strong>已交接<strong class="red">${num}件</strong>被服，您确认交接吗？`;
+        }
         this.models1 = {
           disjunctor: true,
           title: "提示",
-          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>，您确认交接吗？`,
+          content,
           icon: "warn",
           operate: {
             ok: "确定",
@@ -190,11 +239,49 @@
           }
         });
       },
+      getNoFillInQuantityIds(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/simple/data/fetchDataList/taskTypeConfig", {
+            "idx": 0,
+            "sum": 10,
+            "taskTypeConfig": {
+                "taskTypeDTO": {
+                    "hosId": {
+                        "id": this.hosId
+                    },
+                    "ordinaryField": {
+                        "key": "ordinary_field",
+                        "value": "clothingGet"
+                    }
+                }
+            }
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.status == 200) {
+            let dataList = result.list || [];
+            if(dataList.length){
+              let flag = dataList[0].noFillInQuantityIds.split(',').includes(this.queryObj.startDeptId);
+              if(flag){
+                this.showModel2();
+              }
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
     },
     onLoad(options) {
       console.log(options, "result");
       this.queryObj = options;
       this.getInfo();
+      this.getNoFillInQuantityIds();
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif
@@ -253,7 +340,7 @@
         border-bottom: 1rpx solid #EEEEEE;
         .Scanning_cont_head_item{
           flex: 1;
-          font-size: 28rpx;
+          font-size: 32rpx;
           font-weight: bold;
           display: flex;
           justify-content: center;
@@ -303,17 +390,22 @@
           display: flex;
           align-items: center;
           font-size: 28rpx;
-          border-bottom: 1rpx solid #CCCCCC;
+          border: 1rpx solid #272727;
+          border-top: none;
           &.Scanning_cont_list_head{
             font-weight: bold;
             font-size: 28rpx;
-            border-bottom: none;
+            border-top: 1rpx solid #272727;
             flex-shrink: 0;
           }
           .name,
           .value{
             padding: 0 40rpx;
             flex: 1;
+            display: flex;
+            align-items: center;
+            height: 100%;
+            border-right: 1rpx solid #272727;
           }
           .value {
             view{

pages/quiltWashing/quiltWashingSendSignIn/quiltWashingSendSignIn.vue

@@ -110,18 +110,8 @@
                   .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`,
-                            });
-                          }
-                        },
+                      uni.navigateTo({
+                        url: `../../receiptpage/receiptpage`,
                       });
                     } else {
                       uni.navigateTo({
@@ -237,7 +227,7 @@
         border-bottom: 1rpx solid #EEEEEE;
         .Scanning_cont_head_item{
           flex: 1;
-          font-size: 28rpx;
+          font-size: 32rpx;
           font-weight: bold;
           display: flex;
           justify-content: center;
@@ -287,17 +277,22 @@
           display: flex;
           align-items: center;
           font-size: 28rpx;
-          border-bottom: 1rpx solid #CCCCCC;
+          border: 1rpx solid #272727;
+          border-top: none;
           &.Scanning_cont_list_head{
             font-weight: bold;
             font-size: 28rpx;
-            border-bottom: none;
+            border-top: 1rpx solid #272727;
             flex-shrink: 0;
           }
           .name,
           .value{
             padding: 0 10rpx;
             flex: 1;
+            display: flex;
+            align-items: center;
+            height: 100%;
+            border-right: 1rpx solid #272727;
           }
           .value {
             view{

pages/receiptpage/receiptpage.vue

@@ -385,6 +385,9 @@
     <!-- 被服洗涤弹窗 -->
     <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>
   </view>
 </template>
 <script>
@@ -408,6 +411,7 @@
   export default {
     data() {
       return {
+        clothingType: '',//被服回收扫码的类型，dept|user
         isShowExecFilter: false,
         deptName: '',
         currentId: 0,
@@ -492,6 +496,10 @@
         models1: {
           disjunctor: false,
         },
+        // 弹窗model
+        models2: {
+          disjunctor: false,
+        },
         // 悬浮按钮样式
         pattern: {
           buttonColor: "#6cc076",
@@ -1511,27 +1519,29 @@
           title: "加载中",
           mask: true,
         });
+        let startDeptId, startDeptName, handoverId, handoverName;
+        if(this.clothingType === 'user'){
+          startDeptId = this.quiltData.dept.id;
+          startDeptName = this.quiltData.dept.dept;
+          handoverId = this.quiltData.id;
+          handoverName = this.quiltData.name;
+        }else if(this.clothingType === 'dept'){
+          startDeptId = this.quiltData.id;
+          startDeptName = this.quiltData.dept;
+          handoverId = undefined;
+          handoverName = '';
+        }
         post("/transflow/createOrTakeOrder", {
           type: 'clothingGet',
           id: 0,
-          startDeptId: this.quiltData.dept.id,
+          startDeptId,
           hosId: this.hosId,
-          handoverId: this.quiltData.id,
+          handoverId,
         }).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: `../quiltWashing/quiltWashingGetSignIn/quiltWashingGetSignIn?quiltCode=${this.quiltCode}&startDeptId=${this.quiltData.dept.id}&startDeptName=${this.quiltData.dept.dept}&orderId=${res.data.orderId}&name=${this.quiltData.name}`,
-                  });
-                }
-              },
+            uni.navigateTo({
+              url: `../quiltWashing/quiltWashingGetSignIn/quiltWashingGetSignIn?quiltCode=${this.quiltCode}&startDeptId=${startDeptId}&startDeptName=${startDeptName}&orderId=${res.data.orderId}&name=${handoverName}`,
             });
           }else{
             uni.showToast({
@@ -1548,10 +1558,16 @@
       // 被服回收弹窗
       showQuiltData(data) {
         this.quiltData = data;
+        let content = '';
+        if(this.clothingType === 'user'){
+          content = `您扫描的是<strong class="red">${data.name}</strong>的工号，是否建立<strong class="red">${data.dept.dept}</strong>的被服回收工单吗？`;
+        }else if(this.clothingType === 'dept'){
+          content = `您扫描的科室码，是否建立<strong class="red">${data.dept}</strong>的被服回收工单吗？`;
+        }
         this.models1 = {
           disjunctor: true,
           title: "提示",
-          content: `您扫描的是${data.name}的工号，是否建立${data.dept.dept}的被服回收工单吗？`,
+          content,
           icon: "warn",
           operate: {
             ok: "建立工单",
@@ -1559,6 +1575,106 @@
           },
         };
       },
+      //确定
+      ok2(deptDto) {
+        console.log(deptDto);
+        this.models2.disjunctor = false;
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        let startDeptId, startDeptName, handoverId, handoverName;
+        if(this.clothingType === 'user'){
+          startDeptId = deptDto.id;
+          startDeptName = deptDto.dept;
+          handoverId = this.quiltData.id;
+          handoverName = this.quiltData.name;
+        }else if(this.clothingType === 'dept'){
+          startDeptId = deptDto.id;
+          startDeptName = deptDto.dept;
+          handoverId = undefined;
+          handoverName = '';
+        }
+        post("/transflow/createOrTakeOrder", {
+          type: 'clothingGet',
+          id: 0,
+          startDeptId,
+          hosId: this.hosId,
+          handoverId,
+        }).then((res) => {
+          uni.hideLoading();
+          if (res.data && res.data.state == 200) {
+            uni.navigateTo({
+              url: `../quiltWashing/quiltWashingGetSignIn/quiltWashingGetSignIn?quiltCode=${this.quiltCode}&startDeptId=${startDeptId}&startDeptName=${startDeptName}&orderId=${res.data.orderId}&name=${handoverName}`,
+            });
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.data ? res.data.msg : "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      //取消
+      cancel2() {
+        this.models2.disjunctor = false;
+      },
+      showParentQuiltData(data){
+        this.quiltData = data;
+        // 判断是否是父级科室
+        let startDeptId, startDeptName, handoverId, handoverName, content;
+        if(this.clothingType === 'user'){
+          startDeptId = this.quiltData.dept.id;
+          startDeptName = this.quiltData.dept.dept;
+          handoverId = this.quiltData.id;
+          handoverName = this.quiltData.name;
+          content = `您扫描的是<strong class="red">${handoverName}</strong>的工号，科室为<strong class="red">${startDeptName}</strong>，需要选择相应的子级科室建单。`;
+        }else if(this.clothingType === 'dept'){
+          startDeptId = this.quiltData.id;
+          startDeptName = this.quiltData.dept;
+          handoverId = undefined;
+          handoverName = '';
+          content = `您扫描的是科室为<strong class="red">${startDeptName}</strong>，需要选择相应的子级科室建单。`;
+        }
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/data/fetchDataList/department", {
+          "idx": 0,
+          "sum": 9999,
+          "department": {
+              "cascadeHosId": this.hosId,
+              "parent": {
+                "id": startDeptId
+              },
+              "searchType": 1,// 简单查询
+          }
+        }).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            if(res.list.length > 0){
+              this.models2 = {
+                disjunctor: true,
+                title: "提示",
+                content,
+                icon: "warn",
+                list: res.list,
+                operate: {
+                  cancel: "取消",
+                },
+              };
+            }else{
+              this.showQuiltData(data)
+            }
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.data ? res.data.msg : "接口获取数据失败！",
+            });
+          }
+        });
+      },
       // 扫描工牌-被服洗涤
       quiltScan() {
         if (!this.SMFlag) {
@@ -1586,7 +1702,9 @@
                   .then((res) => {
                     uni.hideLoading();
                     if (res.state == 200) {
-                      this.showQuiltData(res.data)
+                      this.clothingType = res.type;
+                      this.showParentQuiltData(res.data);
+                      // this.showQuiltData(res.data)
                     } else {
                       uni.navigateTo({
                         url: `../scanning_Result/scanning_Result?status=${res.state}&msg=${res.msg}&qrcode=${this.quiltCode}`,

pages/scanning_all/scanning_all.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="Scanning_all">
     <view class="Scanning">
-      <view class="Scanning_top" id="Scanning_tops" :animation="animationData">
+      <view class="Scanning_top" id="Scanning_tops" :animation="animationData" v-if="workData.length > 0">
         <view class="Scanning_top_icon">
           <text class="cubeic-ok icon_transport transport-duigou"></text>
         </view>
@@ -13,12 +13,23 @@
           <view>可选择多个工单后,点击 一键送达 完成配送.</view>
         </view>
       </view>
-      <view class="title" v-if="workData && workData.length > 0">
+      <view class="Scanning_top" id="Scanning_tops" :animation="animationData" v-if="workData.length === 0">
+        <view class="Scanning_top_icon">
+          <text class="cubeic-close icon_transport transport-shibai"></text>
+        </view>
+        <view class="Scanning_top_text">
+          <view class="text1">签到失败</view>
+        </view>
+        <view class="Scanning_cont">
+          您扫描的科室为<text class="red">{{deptName}}</text>，未匹配到工单，请确认。
+        </view>
+      </view>
+      <view class="title" v-if="workData.length > 0">
         <text class="span1">工单信息</text>
         <text class="span2" @click="all()" v-if="tabType != 'specimenPlan'">全选</text>
         <text class="span3" @click="Dall()">全不选</text>
       </view>
-      <view class="tabs" v-if="workData && workData.length > 0">
+      <view class="tabs" v-if="workData.length > 0">
         <view class="tab">
           <view @click="act('drugsBag')" v-if="infoDATA['drugsBag']">
             <view id="10" :class="{ acts: tabType == 'drugsBag' }">药品({{ infoDATA.drugsBag.length }})</view>
@@ -53,13 +64,13 @@
           </view>
         </view>
       </view>
-      <view class="page_items" v-if="!workData" style="font-size: 18px; margin-top: 15%">
+      <view class="page_items" v-if="!workData.length" style="font-size: 18px; margin-top: 15%">
         <view class="zwsj">
           <image class="zwsj_img" mode="widthFix" src="../../static/img/zanwushuju.png"></image>
           <view class="zwsj_txt">暂无工单</view>
         </view>
       </view>
-      <view class="page_items footerOtherMargin" v-if="workData && workData.length > 0">
+      <view class="page_items footerOtherMargin" v-if="workData.length > 0">
         <view class="page_item" v-for="(infoDATA, i) of workData" :key="i">
           <view class="page_item_top">
             <view class="page_item_top_L">
@@ -164,12 +175,12 @@
         </view>
       </view>
 
-      <view class="foot_btn2 footerPadding" v-if="workData && workData.length > 0">
+      <view class="foot_btn2 footerPadding" v-if="workData.length > 0">
         <view class="btn1" @click="allStart()" v-if="flag">一键操作</view>
         <view class="btn1" v-if="!flag">一键操作</view>
         <view class="btn1" @click="showAlert">知道了</view>
       </view>
-      <view class="foot_btn1 footerPadding" v-if="!workData">
+      <view class="foot_btn1 footerPadding" v-if="!workData.length">
         <view class="btn3" @click="showAlert">知道了</view>
       </view>
     </view>
@@ -717,7 +728,7 @@
       act(type) {
         this.Dall();
         this.tabType = type;
-        this.workData = this.infoDATA[type];
+        this.workData = this.infoDATA[type] || [];
         this.all();
       },
       // 已选择的项中是否包含该id
@@ -836,7 +847,7 @@
         }
       }
       console.log(this.infoDATA);
-      this.workData = this.infoDATA[arr[0]];
+      this.workData = this.infoDATA[arr[0]] || [];
       this.tabType = arr[0];
       this.all();
       // #ifdef APP-PLUS
@@ -976,6 +987,11 @@
             font-size: 140rpx;
             color: #35b34a;
           }
+          
+          .cubeic-close {
+          	font-size: 140rpx;
+          	color: #ff3b53;
+          }
         }
 
         .Scanning_top_text {