医费绑定，医费核对，医费详情

components/bigScreen/bigScreen.vue

@@ -241,7 +241,7 @@
                 };
                 //微信—大扫描（科室码，患者码，标本码，快捷建单码，药包码）
                 let code = result.code.includes(qrcodePrefix) ? result.code : qrcodePrefix + result.code;
-                post("/workerOrder/scanCode", { code })
+                post("/workerOrder/scanCode", { code, hosId: this.hosId })
                   .then((res) => {
                     uni.hideLoading();
                     if (res.status == 200) {
@@ -415,6 +415,17 @@
                             });
                           }
                         }
+                      } else if(res.type == 'clinicalWaste'){
+                        // 医废
+                        if(res.wasteDetails){
+                          uni.navigateTo({
+                            url: `/pages/medicalWaste/medicalWasteDetail/medicalWasteDetail?qrcode=${res.code}`,
+                          });
+                        }else{
+                          uni.navigateTo({
+                            url: `/pages/medicalWaste/medicalWasteBind/medicalWasteBind?qrcode=${res.code}`,
+                          });
+                        }
                       }
                     } else {
                       if(res.bigScanSpecialMsg){

package-lock.json

@@ -9,6 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
+        "big.js": "^6.2.1",
         "crypto-js": "^4.1.1",
         "dayjs": "^1.11.10",
         "js-base64": "^3.7.5",
@@ -45,6 +46,14 @@
         "tweetnacl": "^0.14.3"
       }
     },
+    "node_modules/big.js": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-6.2.1.tgz",
+      "integrity": "sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmmirror.com/brace-expansion/download/brace-expansion-1.1.11.tgz",
@@ -436,6 +445,11 @@
         "tweetnacl": "^0.14.3"
       }
     },
+    "big.js": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmmirror.com/big.js/-/big.js-6.2.1.tgz",
+      "integrity": "sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ=="
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmmirror.com/brace-expansion/download/brace-expansion-1.1.11.tgz",

package.json

@@ -14,6 +14,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "big.js": "^6.2.1",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.11.10",
     "js-base64": "^3.7.5",

pages.json

@@ -583,6 +583,30 @@
           "titleNView": false
         }
       }
+    },
+    {
+      "path": "pages/medicalWaste/medicalWasteBind/medicalWasteBind",//医废绑定
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    },
+    {
+      "path": "pages/medicalWaste/medicalWasteBindCheck/medicalWasteBindCheck",//医废绑定-回收核对
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    },
+    {
+      "path": "pages/medicalWaste/medicalWasteDetail/medicalWasteDetail", //医废详情
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
     }
   ],
   "globalStyle": {

pages/medicalWaste/medicalWasteBind/medicalWasteBind.vue

@@ -0,0 +1,511 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-ok icon_transport transport-duigou"></text>
+      </view>
+      <view class="Scanning_top_text">
+        请填写以下信息绑定条码
+      </view>
+    </view>
+
+    <view class="Scanning_cont yf">
+      <view class="Scanning_cont_list">
+        <view>序号：{{queryObj.qrcode}}</view>
+        <view class="red">{{id ? '已修改' : ''}}</view>
+      </view>
+      <view class="Scanning_cont_list">
+        <view class="Scanning_cont_list_title">
+          科室：
+        </view>
+        <view class="Scanning_cont_list_desc" v-if="disabledDept">
+          <text>{{deptName}}</text>
+        </view>
+        <view class="Scanning_cont_list_desc" v-else>
+          <input disabled class="deptInput" placeholder="请搜索科室" placeholder-style="color:#C3BFBF;font-size:28rpx;padding:8rpx;line-height:1;" v-model="deptName" />
+          <view class="mask" @click="changeDept"></view>
+          <text class="icon_transport transport-sousuo"></text>
+          <text class="newicon newicon-saoma" @click="scanDept"></text>
+        </view>
+      </view>
+      <view class="Scanning_cont_list">
+        <view class="Scanning_cont_list_title">
+          医废类型：
+        </view>
+        <view class="Scanning_cont_list_desc">
+          <picker @change="bindMedicalWasteType" :value="medicalWasteTypeIndex" :range="medicalWasteTypes" range-key="typeName">
+            <view class="typeInput">{{medicalWasteTypes[medicalWasteTypeIndex] ? medicalWasteTypes[medicalWasteTypeIndex].typeName : ''}}</view>
+            <text class="newicon newicon-xiala1"></text>
+          </picker>
+        </view>
+      </view>
+      <view class="Scanning_cont_list">
+        <view class="Scanning_cont_list_title">
+          重量：
+        </view>
+        <view class="Scanning_cont_list_desc">
+          <input class="deptInput" type="digit" placeholder-style="color:#C3BFBF;font-size:28rpx;padding:8rpx;line-height:1;" @blur="blurWeight" v-model="weight" />kg
+        </view>
+      </view>
+      <view class="Scanning_cont_list">
+        <view class="Scanning_cont_list_title">
+          备注：
+        </view>
+        <view class="Scanning_cont_list_desc">
+          <textarea class="remarkInput" placeholder-style="color:#C3BFBF;font-size:28rpx;padding:8rpx;line-height:normal;" v-model="remark" placeholder="请输入备注信息" />
+        </view>
+      </view>
+    </view>
+
+    <view class="foot_btn">
+      <view class="btn" @click="scanNext(true)"> 继续扫描 </view>
+      <view class="btn" @click="scanNext(false)"> 核对回收 </view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "../../../http/http.js";
+  export default {
+    data() {
+      return {
+        id: null,
+        disabledDept: false,
+        SMFlag: true,
+        remark: '',
+        deptId: null,
+        deptName: '',
+        weight: 0,
+        medicalWasteTypes: [],
+        medicalWasteTypeIndex: 0,
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        queryObj: {}, //路由传递过来的数据
+      };
+    },
+    onShow() {
+      this.SMFlag = true;
+    },
+    methods: {
+      // 扫科室
+      scanDept() {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        SM().then((content) => {
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          //检验二维码的有效性(扫码前必须验证)
+          post("/dept/scanning", {
+              content,
+            })
+            .then((result) => {
+              this.SMFlag = true;
+              // 200检测通过，201没有有效期也通过。
+              if (result.state == 200 || result.state == 201) {
+                let data = {
+                  code: result.code, //二维码
+                };
+                
+                post("/medicalWaste/scanByCode", {
+                  code: result.code,
+                  hosId: this.hosId,
+                })
+                  .then((res) => {
+                    uni.hideLoading();
+                    if (res.status == 200 && res.data) {
+                      this.deptId = res.data.id;
+                      this.deptName = res.data.dept;
+                    } else {
+                      uni.showToast({
+                        icon: "none",
+                        title: res.msg || "接口获取数据失败！",
+                      });
+                    }
+                  });
+              } else {
+                uni.hideLoading();
+                uni.showToast({
+                  icon: "none",
+                  title: result.info || "接口获取数据失败！",
+                });
+              }
+            })
+        }).catch(err => {
+          this.SMFlag = true;
+        });
+      },
+      scanNestCommonGoOn(isScan = false){
+        if(isScan){
+          // 继续扫描
+          SM().then((content) => {
+            uni.showLoading({
+              title: "加载中",
+              mask: true,
+            });
+            //检验二维码的有效性(扫码前必须验证)
+            post("/dept/scanning", {
+                content,
+              })
+              .then((result) => {
+                // 200检测通过，201没有有效期也通过。
+                if (result.state == 200 || result.state == 201) {
+                  // 判断是否是医废
+                  post("/medicalWaste/continueScan", { code: result.code, hosId: this.hosId })
+                    .then((res) => {
+                      uni.hideLoading();
+                      if (res.status == 200) {
+                        this.disabledDept = true;
+                        if(res.wasteInfo){
+                          // 编辑
+                          this.id = res.wasteInfo.id;
+                        } else {
+                          // 新增
+                          this.id = undefined;
+                          this.queryObj.qrcode = res.code;
+                          this.weight = 0;
+                          this.medicalWasteTypeIndex = 0;
+                          this.remark = '';
+                        }
+                      } else {
+                        uni.showToast({
+                          icon: "none",
+                          title: res.msg || "接口获取数据失败！",
+                        });
+                      }
+                    });
+                } else {
+                  uni.hideLoading();
+                  uni.showToast({
+                    icon: "none",
+                    title: result.info || "接口获取数据失败！",
+                  });
+                }
+              })
+          }).catch(err => {});
+        }else{
+          // 核对回收
+          uni.navigateTo({
+            url: `/pages/medicalWaste/medicalWasteBindCheck/medicalWasteBindCheck?deptName=${this.deptName}&deptId=${this.deptId}`,
+          });
+        }
+      },
+      // 继续扫描
+      scanNextCommon(isScan = false){
+        let postData = {
+          wasteInfo: {
+            clinicalWasteType: this.medicalWasteTypes[this.medicalWasteTypeIndex],
+            clinicalWasteSn: this.queryObj.qrcode,
+            weight: +this.weight,
+            deptId: +this.deptId,
+            remark: this.remark,
+            hosId: this.hosId,
+            id: this.id || undefined,
+          }
+        }
+        console.log(postData);
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/medicalWaste/bindInfo", postData)
+          .then((result1) => {
+            uni.hideLoading();
+            if (result1.status == 200) {
+              this.scanNestCommonGoOn(isScan);
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: result1.msg || "接口获取数据失败！",
+              });
+            }
+          });
+      },
+      // 继续扫描-判断重量
+      scanNext(isScan = false) {
+        if(!this.deptId){
+          uni.showModal({
+            title: "提示",
+            content: "请选择科室！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        }
+        if(this.medicalWasteTypeIndex == 0){
+          uni.showModal({
+            title: "提示",
+            content: "请选择医废类型！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        }
+        let postData = {
+            clinicalWasteTypeId: this.medicalWasteTypes[this.medicalWasteTypeIndex].id,
+            weight: +this.weight,
+            deptId: +this.deptId,
+            hosId: this.hosId,
+        }
+        console.log(postData);
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/medicalWaste/checkLimit", postData)
+          .then((result) => {
+            uni.hideLoading();
+            if (result.status == 200) {
+              this.scanNextCommon(isScan);
+            }else if (result.status == 201) {
+              uni.showModal({
+              	title: '提示',
+              	content: result.msg,
+              	success: (res) => {
+              		if (res.confirm) {
+              			console.log('用户点击确定');
+                    this.scanNextCommon(isScan);
+              		} else if (res.cancel) {
+              			console.log('用户点击取消');
+              		}
+              	}
+              });
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: result.msg || "接口获取数据失败！",
+              });
+            }
+          });
+      },
+      // 选择科室
+      changeDept() {
+        uni.navigateTo({
+          url: `/pages/search/search?type=medicalWasteBind&code=${this.queryObj.qrcode}&remark=${this.remark}&weight=${this.weight}&medicalWasteTypeIndex=${this.medicalWasteTypeIndex}`,
+        });
+      },
+      blurWeight(){
+        this.weight = Math.abs(this.weight).toFixed(2)
+      },
+      bindMedicalWasteType: function(e) {
+          console.log('picker发送选择改变，携带值为', e.detail.value)
+          this.medicalWasteTypeIndex = e.detail.value
+      },
+      getMedicalWasteType(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/simple/data/fetchDataList/clinicalWasteType", {
+          idx: 0,
+          sum: 9999,
+          clinicalWasteType: {
+            hosId: this.hosId
+          }
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.status == 200) {
+            let medicalWasteTypes = result.list || [];
+            medicalWasteTypes.unshift({id: 0, typeName: '请选择'});
+            this.medicalWasteTypes = medicalWasteTypes;
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+    },
+    onLoad(options) {
+      console.log(options, "result");
+      this.queryObj = options;
+      if (options.deptId && options.deptName) {
+        this.deptId = options.deptId;
+        this.deptName = options.deptName;
+        this.remark = options.remark;
+        this.weight = options.weight;
+        this.medicalWasteTypeIndex = options.medicalWasteTypeIndex;
+      }
+      this.getMedicalWasteType();
+      // #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;
+    .yf /deep/ .uni-input-input[disabled]{
+      text-overflow: ellipsis;
+    }
+    .Scanning_top {
+      flex-shrink: 0;
+      .Scanning_top_icon {
+        padding-top: 26rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        .cubeic-ok {
+          font-size: 100rpx;
+          color: #35b34a;
+        }
+
+        .text1 {
+          font-size: 40rpx;
+          font-weight: bold;
+        }
+      }
+      .Scanning_top_text{
+        text-align: center;
+        font-size: 34rpx;
+        font-weight: bold;
+        padding: 26rpx 0 38rpx 0;
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      width: 710rpx;
+      margin: 0 20rpx;
+      padding: 6rpx;
+      background-color: #FBFCFE;
+      box-shadow: 0rpx 3rpx 6rpx 1rpx rgba(0,0,0,0.16);
+      font-size: 28rpx;
+      line-height: 1;
+      .Scanning_cont_list{
+        font-weight: bold;
+        padding: 27rpx 55rpx;
+        border-bottom: 1rpx solid #D9D9D9;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        font-size: 32rpx;
+        &:last-of-type{
+          border-bottom: none;
+        }
+        .Scanning_cont_list_title{
+          font-size: 32rpx;
+        }
+        .Scanning_cont_list_desc{
+          display: flex;
+          align-items: center;
+          position: relative;
+          .mask{
+            content: '';
+            position: absolute;
+            top: 0;
+            right: 50rpx;
+            bottom: 0;
+            left: 0;
+          }
+          .transport-sousuo{
+            position: absolute;
+            right: 56rpx;
+            color:#C3BFBF;
+          }
+          .newicon-saoma{
+            color: #50b249;
+          }
+          .newicon-xiala1{
+            position: absolute;
+            top: 50%;
+            right: 16rpx;
+            color:#C3BFBF;
+            transform: translateY(-50%);
+          }
+          .deptInput{
+            width: 213rpx;
+            height: 56rpx;
+            border: 1rpx solid #D9D9D9;
+            margin-right: 12rpx;
+            padding: 8rpx;
+            font-size: 28rpx;
+            padding-right: 50rpx;
+            box-sizing: border-box;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+          }
+          .typeInput{
+            font-size: 28rpx;
+            width: 260rpx;
+            height: 56rpx;
+            border: 1rpx solid #D9D9D9; 
+            padding: 8rpx;
+            padding-right: 50rpx;
+            box-sizing: border-box;
+            line-height: 38rpx;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+          }
+          .remarkInput{
+            font-size: 28rpx;
+            width: 500rpx;
+            height: 174rpx;
+            line-height: mormal;
+            border: 1rpx solid #D9D9D9; 
+            padding: 8rpx;
+            box-sizing: border-box;
+          }
+        }
+      }
+    }
+
+    .foot_btn {
+      margin: 57rpx 30rpx 10rpx;
+      flex-shrink: 0;
+      display: flex;
+      justify-content: center;
+
+      .btn {
+        height: 88rpx;
+        line-height: 1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex: 1;
+        margin-right: 32rpx;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 34rpx;
+        font-weight: bold;
+        &:last-of-type{
+          margin-right: 0;
+        }
+      }
+    }
+  }
+</style>

pages/medicalWaste/medicalWasteBindCheck/medicalWasteBindCheck.vue

@@ -0,0 +1,292 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-ok icon_transport transport-duigou"></text>
+      </view>
+      <view class="Scanning_top_text">
+        <text>回收医废科室为“{{queryObj.deptName}}”，总重量为{{weightTotal}}kg，{{countTotal}}袋医废。</text>
+        <text>请扫描人员工牌或科室码交接。</text>
+      </view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view class="Scanning_cont_head">
+        <view>医废类型</view>
+        <view>医废袋数</view>
+        <view>医废重量</view>
+      </view>
+      <scroll-view scroll-y style="flex: 1;min-height: 0;">
+        <view class="Scanning_cont_list" v-for="item in infoList" :key="item.wasteTypeId">
+          <view>{{item.wasteType}}</view>
+          <view>{{item.wasteCount}}袋</view>
+          <view>{{item.wasteWeight}}kg</view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <view class="foot_btn">
+      <view class="btn" @click="scanDeptOrUser()"> 扫一扫 </view>
+      <view class="btn" @click="goBack()"> 取消 </view>
+    </view>
+    <!-- 弹窗 -->
+    <showModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content"  @know="know1" :operate="models1.operate"></showModel>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "../../../http/http.js";
+  import Big from 'big.js';
+  export default {
+    data() {
+      return {
+        countTotal: 0,
+        weightTotal: 0,
+        SMFlag: true,
+        infoList: [],
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        queryObj: {}, //路由传递过来的数据
+        // 弹窗model
+        models1: {
+          disjunctor: false,
+        },
+      };
+    },
+    onShow() {
+      this.SMFlag = true;
+    },
+    methods: {
+      // 扫科室或人
+      scanDeptOrUser() {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        SM().then((content) => {
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          //检验二维码的有效性(扫码前必须验证)
+          post("/dept/scanning", {
+              content,
+            })
+            .then((result) => {
+              this.SMFlag = true;
+              // 200检测通过，201没有有效期也通过。
+              if (result.state == 200 || result.state == 201) {
+                let data = {
+                  code: result.code, //二维码
+                };
+                
+                post("/medicalWaste/checkComplete", {
+                  code: result.code,
+                  deptId: +this.queryObj.deptId,
+                  hosId: this.hosId,
+                  clinicalWasteTypeIds: this.infoList.map(v => v.wasteTypeId).toString(),
+                })
+                  .then((res) => {
+                    uni.hideLoading();
+                    if (res.status == 200 && res.data) {
+                      this.showModel1(res.data, res.type);
+                    } else {
+                      uni.showToast({
+                        icon: "none",
+                        title: res.msg || "接口获取数据失败！",
+                      });
+                    }
+                  });
+              } else {
+                uni.hideLoading();
+                uni.showToast({
+                  icon: "none",
+                  title: result.info || "接口获取数据失败！",
+                });
+              }
+            })
+        }).catch(err => {
+          this.SMFlag = true;
+        });
+      },
+      getInfo(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/medicalWaste/checkComplete", {
+            deptId: +this.queryObj.deptId,
+            hosId: this.hosId
+          }).then((result) => {
+          uni.hideLoading();
+          if (result.status == 200) {
+            this.infoList = result.data || [];
+            this.countTotal = this.infoList.reduce((pre, cur) => pre + cur.wasteCount, 0);
+            this.weightTotal = this.infoList.reduce((pre, cur) => Big(pre).plus(cur.wasteWeight), 0);
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      goBack(){
+        uni.navigateBack();
+      },
+      //知道了
+      know1() {
+        this.models1.disjunctor = false;
+        uni.navigateTo({
+          url: `/pages/receiptpage/receiptpage`,
+        });
+      },
+      // 被服送回弹窗
+      showModel1(data, type) {
+        let content = '';
+        if(type === 'dept'){
+          content = `您与<strong class="red">${data.dept}</strong>成功交接，总重量为<strong class="red">${this.weightTotal}kg</strong>，<strong class="red">${this.countTotal}袋</strong>医废`;
+        }else if(type === 'user'){
+          content = `您与<strong class="red">${data.name}</strong>，<strong class="red">${data.dept?data.dept.dept:''}</strong>成功交接，总重量为<strong class="red">${this.weightTotal}kg</strong>，<strong class="red">${this.countTotal}袋</strong>医废`;
+        }
+        
+        this.models1 = {
+          disjunctor: true,
+          title: "提示",
+          content,
+          icon: "warn",
+          operate: {
+            know: "知道了",
+          },
+        };
+      },
+    },
+    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;
+    .yf /deep/ .uni-input-input[disabled]{
+      text-overflow: ellipsis;
+    }
+    .Scanning_top {
+      flex-shrink: 0;
+      .Scanning_top_icon {
+        padding-top: 26rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        .cubeic-ok {
+          font-size: 100rpx;
+          color: #35b34a;
+        }
+
+        .text1 {
+          font-size: 40rpx;
+          font-weight: bold;
+        }
+      }
+      .Scanning_top_text{
+        font-size: 34rpx;
+        font-weight: bold;
+        padding: 26rpx 32rpx 38rpx 32rpx;
+        display: flex;
+        flex-direction: column;
+        line-height: 1.5;
+        text{
+          word-break: break-all;
+        }
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      width: 710rpx;
+      margin: 0 20rpx;
+      padding: 6rpx;
+      font-size: 28rpx;
+      line-height: 1;
+      .Scanning_cont_head{
+        font-weight: bold;
+        height: 92rpx;
+        background: #FBFCFE;
+        box-shadow: 0rpx 3rpx 6rpx 1rpx rgba(0,0,0,0.16);
+        display: flex;
+        align-items: center;
+        font-size: 32rpx;
+        view{
+          flex: 1;
+          flex-shrink: 0;
+          text-align: center;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          white-space: nowrap;
+        }
+      }
+      .Scanning_cont_list{
+        font-weight: bold;
+        padding: 27rpx 0;
+        border-bottom: 1rpx solid #D9D9D9;
+        display: flex;
+        align-items: center;
+        font-size: 32rpx;
+        view{
+          flex: 1;
+          flex-shrink: 0;
+          text-align: center;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          white-space: nowrap;
+          line-height: normal;
+        }
+      }
+    }
+
+    .foot_btn {
+      margin: 57rpx 30rpx 10rpx;
+      flex-shrink: 0;
+      display: flex;
+      justify-content: center;
+
+      .btn {
+        height: 88rpx;
+        line-height: 1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex: 1;
+        margin-right: 32rpx;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 34rpx;
+        font-weight: bold;
+        &:last-of-type{
+          margin-right: 0;
+        }
+      }
+    }
+  }
+</style>

pages/medicalWaste/medicalWasteDetail/medicalWasteDetail.vue

@@ -0,0 +1,282 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_text">
+        医废详情
+      </view>
+    </view>
+
+    <scroll-view scroll-y class="Scanning_cont">
+      <view class="Scanning_cont_list">
+        <view class="Scanning_cont_list_head">
+          <view class="circle"></view>
+          <view class="title">详情内容</view>
+        </view>
+        <view class="Scanning_cont_list_body">
+          <view class="Scanning_cont_list_body_item">
+            <view class="Scanning_cont_list_body_title">医废类型：</view>
+            <view class="Scanning_cont_list_body_desc">{{info.clinicalWasteType ? info.clinicalWasteType.typeName : ''}}</view>
+          </view>
+          <view class="Scanning_cont_list_body_item">
+            <view class="Scanning_cont_list_body_title">医废序号：</view>
+            <view class="Scanning_cont_list_body_desc">{{info.clinicalWasteSn}}</view>
+          </view>
+          <view class="Scanning_cont_list_body_item">
+            <view class="Scanning_cont_list_body_title">医废重量：</view>
+            <view class="Scanning_cont_list_body_desc">{{info.weight}}kg</view>
+          </view>
+          <view class="Scanning_cont_list_body_item">
+            <view class="Scanning_cont_list_body_title">申请科室：</view>
+            <view class="Scanning_cont_list_body_desc">{{info.dept ? info.dept.dept : ''}}</view>
+          </view>
+          <view class="Scanning_cont_list_body_item">
+            <view class="Scanning_cont_list_body_title">收取人：</view>
+            <view class="Scanning_cont_list_body_desc">{{info.receivor ? info.receivor.name : ''}}</view>
+          </view>
+          <view class="Scanning_cont_list_body_item">
+            <view class="Scanning_cont_list_body_title">收取时间：</view>
+            <view class="Scanning_cont_list_body_desc">{{info.receiveTime | formatDate('yyyy-MM-dd hh:mm:ss')}}</view>
+          </view>
+          <view class="Scanning_cont_list_body_item">
+            <view class="Scanning_cont_list_body_title">交接人：</view>
+            <view class="Scanning_cont_list_body_desc">{{info.handover ? info.handover.name : ''}}</view>
+          </view>
+          <view class="Scanning_cont_list_body_item">
+            <view class="Scanning_cont_list_body_title">备注：</view>
+            <view class="Scanning_cont_list_body_desc">{{info.remark}}</view>
+          </view>
+        </view>
+      </view>
+      <view class="Scanning_cont_list">
+        <view class="Scanning_cont_list_head">
+          <view class="circle"></view>
+          <view class="title">操作日志</view>
+        </view>
+        <view class="Scanning_cont_list_log">
+          <view class="Scanning_cont_list_log_item" v-for="(item, index) in info.wasteLogList" :key="index">
+            <view class="Scanning_cont_list_log_title">
+              <view class="statusText">{{item.operationType ? item.operationType.name : ''}}</view>
+              <view class="statusIcon newicon newicon-icon_zhengzaijinx"></view>
+              <view class="statusDate">{{item.operationTime | formatDate('MM-dd hh:mm')}}</view>
+              <view class="statusUser">{{item.operatorName}}</view>
+            </view>
+            <view class="Scanning_cont_list_log_desc" :class="{noBorder: index == info.wasteLogList.length - 1}" v-if="item.operationType.value == 5 && item.correctWeight && item.correctWeight">矫正前为{{item.correctWeight}}kg，矫正后为{{item.lastWeight}}kg</view>
+            <view class="Scanning_cont_list_log_desc" :class="{noBorder: index == info.wasteLogList.length - 1}" v-else-if="item.handoverName">交接人：{{item.handoverName}}</view>
+            <view class="Scanning_cont_list_log_desc" :class="{noBorder: index == info.wasteLogList.length - 1}" v-else></view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+
+    <view class="foot_btn">
+      <view class="btn" @click="goToList()"> 知道了 </view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "../../../http/http.js";
+  export default {
+    data() {
+      return {
+        info: {},
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        queryObj: {}, //路由传递过来的数据
+      };
+    },
+    methods: {
+      goToList(){
+        uni.navigateTo({
+          url: `/pages/receiptpage/receiptpage`,
+        });
+      },
+      getInfo(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/medicalWaste/details", {
+          code: this.queryObj.qrcode,
+          hosId: this.hosId,
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.status == 200) {
+            let info = result.wasteDetails || {};
+            info.wasteLogList = info.wasteLogList || [];
+            this.info = info;
+          } 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: #F9FAFC;
+    .yf /deep/ .uni-input-input[disabled]{
+      text-overflow: ellipsis;
+    }
+    .Scanning_top {
+      flex-shrink: 0;
+      .Scanning_top_icon {
+        padding-top: 26rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        .cubeic-ok {
+          font-size: 100rpx;
+          color: #35b34a;
+        }
+
+        .text1 {
+          font-size: 40rpx;
+          font-weight: bold;
+        }
+      }
+      .Scanning_top_text{
+        text-align: center;
+        font-size: 36rpx;
+        font-weight: bold;
+        padding: 26rpx 0 38rpx 0;
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      margin: 0 20rpx;
+      padding: 14rpx;
+      background-color: #fff;
+      border: 1rpx solid #CBCBCB;
+      border-radius: 8rpx;
+      font-size: 28rpx;
+      width: calc(100% - 20rpx);
+      .Scanning_cont_list{
+        font-weight: bold;
+        padding: 0 6rpx;
+        font-size: 32rpx;
+        margin-bottom: 20rpx;
+        .Scanning_cont_list_head{
+          height: 65rpx;
+          display: flex;
+          align-items: center;
+          border-bottom: 1rpx dashed #CCCCCC;
+         .circle{
+           width: 22rpx;
+           height: 22rpx;
+           border-radius: 50%;
+           background-color: #49B856;
+           margin-right: 7rpx;
+         }
+         .title{
+           font-size: 28rpx;
+           font-weight: bold;
+         }
+        }
+        .Scanning_cont_list_body{
+          padding: 0 46rpx;
+          font-size: 28rpx;
+          .Scanning_cont_list_body_item{
+            margin-top: 20rpx;
+            overflow: hidden;
+            display: flex;
+            .Scanning_cont_list_body_title{
+              float: left;
+            }
+            .Scanning_cont_list_body_desc{
+              float: left;
+              flex: 1;
+            }
+          }
+        }
+        .Scanning_cont_list_log{
+          padding: 25rpx 86rpx;
+          font-size: 28rpx;
+          .Scanning_cont_list_log_item{
+            .Scanning_cont_list_log_title{
+              display: flex;
+              line-height: 1;
+              .statusText{
+                width: 2em;
+                position: absolute;
+              }
+              .statusIcon{
+                margin-left: 78rpx;
+                margin-right: 7rpx;
+                color: #35B24A;
+              }
+              .statusDate{
+                margin-right: 20rpx;
+                color: #A5A5A5;
+              }
+              .statusUser{
+                color: #A5A5A5;
+              }
+            }
+            .Scanning_cont_list_log_desc{
+              padding: 10rpx 20rpx;
+              height: 85rpx;
+              border-left: 2rpx solid #35B24A;
+              margin-left: 92rpx;
+              &.noBorder{
+                border-left: none;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    .foot_btn {
+      margin: 57rpx 20rpx 10rpx;
+      flex-shrink: 0;
+      display: flex;
+      justify-content: center;
+
+      .btn {
+        height: 88rpx;
+        line-height: 1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex: 1;
+        margin-right: 32rpx;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 34rpx;
+        font-weight: bold;
+        &:last-of-type{
+          margin-right: 0;
+        }
+      }
+    }
+  }
+</style>

pages/search/search.vue

@@ -88,6 +88,12 @@
         //自选排班-科室绑定人员-科室类型 start
         quickCombinationDeptType: 0,
         //自选排班-科室绑定人员-科室类型 end
+        //医废绑定 start
+        medicalWasteBindCode: '',
+        medicalWasteBindRemark: '',
+        medicalWasteBindWeight: '',
+        medicalWasteTypeIndex: '',
+        //医废绑定 end
       };
     },
     onUnload() {
@@ -127,6 +133,12 @@
         this.sysDeptType = -1;
       }  else if (this.type == "pharmacy") { //药房切换科室
         this.sysDeptType = 386;
+      }  else if (this.type == "medicalWasteBind") { //医废绑定
+        this.medicalWasteBindCode = options.code;
+        this.medicalWasteBindRemark = options.remark;
+        this.medicalWasteBindWeight = options.weight;
+        this.medicalWasteTypeIndex = options.medicalWasteTypeIndex;
+        this.sysDeptType = -1;
       }  else if (this.type == "showDepartmentQrcode") { //科室二维码绑定
         this.sysDeptType = -1;
       }  else if (this.type == "bloodSelect") { //选择血制品送达科室
@@ -251,7 +263,7 @@
           }
         }
         //不是送回病房
-        if (this.type != "sendBack" && this.type != "sendBackPatientList" && this.type != "settingCode" && this.type != "bloodSelect" && this.type != "showDepartmentQrcode") {
+        if (this.type != "sendBack" && this.type != "sendBackPatientList" && this.type != "settingCode" && this.type != "bloodSelect" && this.type != "showDepartmentQrcode" && this.type != "medicalWasteBind") {
           if(this.quickCombinationDeptType){
             postData.department.deptTypeIds = this.quickCombinationDeptType;
           } else if (this.sysDeptType === 0) {
@@ -388,7 +400,7 @@
         let arr = this.deptList.filter((item) => data.qrId ? (item.qrId === data.qrId) : (item.dept === keyword));
         if (arr.length) {
           let msg = "";
-          if (this.type == "patientInformationList" || this.type == "inspectList" || this.type == "pharmacy" || this.type == "showDepartmentQrcode") {
+          if (this.type == "patientInformationList" || this.type == "inspectList" || this.type == "pharmacy" || this.type == "showDepartmentQrcode" || this.type == "medicalWasteBind") {
             msg = "切换科室成功";
             uni.showToast({
               title: msg,
@@ -428,6 +440,11 @@
             uni.navigateTo({
               url: `../receiptpage/receiptpage?showDepartmentQrcodeId=${arr[0].id}&showDepartmentQrcodeDept=${arr[0].dept}`,
             });
+          } else if (this.type == "medicalWasteBind") {
+            //医废绑定进入
+            uni.navigateTo({
+              url: `/pages/medicalWaste/medicalWasteBind/medicalWasteBind?qrcode=${this.medicalWasteBindCode}&deptId=${arr[0].id}&deptName=${arr[0].dept}&remark=${this.medicalWasteBindRemark}&weight=${this.medicalWasteBindWeight}&medicalWasteTypeIndex=${this.medicalWasteTypeIndex}`,
+            });
           } else if (this.type == "setDept") {
             //上班添加科室进入
             let obj = uni.getStorageSync("setDepts");

static/newIcon/demo_index.html

@@ -55,9 +55,27 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
-              <span class="icon newicon">&#xe605;</span>
-                <div class="name">资源 7</div>
-                <div class="code-name">&amp;#xe605;</div>
+              <span class="icon newicon">&#xe635;</span>
+                <div class="name">icon_zhengzaijinx</div>
+                <div class="code-name">&amp;#xe635;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe662;</span>
+                <div class="name">xiala02</div>
+                <div class="code-name">&amp;#xe662;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe660;</span>
+                <div class="name">扫一扫</div>
+                <div class="code-name">&amp;#xe660;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe60a;</span>
+                <div class="name">医废管理</div>
+                <div class="code-name">&amp;#xe60a;</div>
               </li>
           
             <li class="dib">
@@ -90,9 +108,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'newicon';
-  src: url('iconfont.woff2?t=1698546579618') format('woff2'),
-       url('iconfont.woff?t=1698546579618') format('woff'),
-       url('iconfont.ttf?t=1698546579618') format('truetype');
+  src: url('iconfont.woff2?t=1709362538844') format('woff2'),
+       url('iconfont.woff?t=1709362538844') format('woff'),
+       url('iconfont.ttf?t=1709362538844') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -119,11 +137,38 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
-            <span class="icon newicon newicon-a-ziyuan71"></span>
+            <span class="icon newicon newicon-icon_zhengzaijinx"></span>
+            <div class="name">
+              icon_zhengzaijinx
+            </div>
+            <div class="code-name">.newicon-icon_zhengzaijinx
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-xiala1"></span>
+            <div class="name">
+              xiala02
+            </div>
+            <div class="code-name">.newicon-xiala1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-saoma"></span>
             <div class="name">
-              资源 7
+              扫一扫
             </div>
-            <div class="code-name">.newicon-a-ziyuan71
+            <div class="code-name">.newicon-saoma
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-yifeiguanli"></span>
+            <div class="name">
+              医废管理
+            </div>
+            <div class="code-name">.newicon-yifeiguanli
             </div>
           </li>
           
@@ -174,10 +219,34 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#newicon-a-ziyuan71"></use>
+                  <use xlink:href="#newicon-icon_zhengzaijinx"></use>
+                </svg>
+                <div class="name">icon_zhengzaijinx</div>
+                <div class="code-name">#newicon-icon_zhengzaijinx</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-xiala1"></use>
+                </svg>
+                <div class="name">xiala02</div>
+                <div class="code-name">#newicon-xiala1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-saoma"></use>
+                </svg>
+                <div class="name">扫一扫</div>
+                <div class="code-name">#newicon-saoma</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-yifeiguanli"></use>
                 </svg>
-                <div class="name">资源 7</div>
-                <div class="code-name">#newicon-a-ziyuan71</div>
+                <div class="name">医废管理</div>
+                <div class="code-name">#newicon-yifeiguanli</div>
             </li>
           
             <li class="dib">

static/newIcon/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "newicon"; /* Project id 4304849 */
-  src: url('~@/static/newIcon/iconfont.woff2?t=1698546579618') format('woff2'),
-       url('~@/static/newIcon/iconfont.woff?t=1698546579618') format('woff'),
-       url('~@/static/newIcon/iconfont.ttf?t=1698546579618') format('truetype');
+  src: url('~@/static/newIcon/iconfont.woff2?t=1709362538844') format('woff2'),
+       url('~@/static/newIcon/iconfont.woff?t=1709362538844') format('woff'),
+       url('~@/static/newIcon/iconfont.ttf?t=1709362538844') format('truetype');
 }
 
 .newicon {
@@ -13,8 +13,20 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.newicon-a-ziyuan71:before {
-  content: "\e605";
+.newicon-icon_zhengzaijinx:before {
+  content: "\e635";
+}
+
+.newicon-xiala1:before {
+  content: "\e662";
+}
+
+.newicon-saoma:before {
+  content: "\e660";
+}
+
+.newicon-yifeiguanli:before {
+  content: "\e60a";
 }
 
 .newicon-a-ziyuan7:before {

static/newIcon/iconfont.json

@@ -6,11 +6,32 @@
   "description": "",
   "glyphs": [
     {
-      "icon_id": "37864835",
-      "name": "资源 7",
-      "font_class": "a-ziyuan71",
-      "unicode": "e605",
-      "unicode_decimal": 58885
+      "icon_id": "4852661",
+      "name": "icon_zhengzaijinx",
+      "font_class": "icon_zhengzaijinx",
+      "unicode": "e635",
+      "unicode_decimal": 58933
+    },
+    {
+      "icon_id": "5933299",
+      "name": "xiala02",
+      "font_class": "xiala1",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "6757421",
+      "name": "扫一扫",
+      "font_class": "saoma",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "39332508",
+      "name": "医废管理",
+      "font_class": "yifeiguanli",
+      "unicode": "e60a",
+      "unicode_decimal": 58890
     },
     {
       "icon_id": "37864731",