优化

main.js

@@ -3,10 +3,6 @@ import App from './App'
 // #ifdef H5
 import wx from 'weixin-jsapi'
 import './mixins/mixin'
-// import VConsole from 'vconsole';
-// new VConsole();
-// import eruda from 'eruda';
-// eruda.init();
 console.info('v2.4.51');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合

package-lock.json

@@ -10,10 +10,9 @@
       "license": "ISC",
       "dependencies": {
         "crypto-js": "^4.1.1",
-        "eruda": "^3.0.1",
+        "dayjs": "^1.11.10",
         "js-base64": "^3.7.5",
         "spinkit": "^2.0.1",
-        "vconsole": "^3.14.7",
         "weixin-jsapi": "^1.1.0"
       },
       "devDependencies": {
@@ -21,17 +20,6 @@
         "ssh2-sftp-client": "^7.2.0"
       }
     },
-    "node_modules/@babel/runtime": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.19.0.tgz",
-      "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmmirror.com/asn1/download/asn1-0.2.6.tgz?cache=0&sync_timestamp=1635986760581&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fasn1%2Fdownload%2Fasn1-0.2.6.tgz",
@@ -94,20 +82,6 @@
         "typedarray": "^0.0.6"
       }
     },
-    "node_modules/copy-text-to-clipboard": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz",
-      "integrity": "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/core-js": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.21.1.tgz",
-      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==",
-      "hasInstallScript": true
-    },
     "node_modules/cpu-features": {
       "version": "0.0.2",
       "resolved": "https://registry.npmmirror.com/cpu-features/download/cpu-features-0.0.2.tgz",
@@ -127,17 +101,17 @@
       "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz",
       "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
     },
+    "node_modules/dayjs": {
+      "version": "1.11.10",
+      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz",
+      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+    },
     "node_modules/err-code": {
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/err-code/download/err-code-2.0.3.tgz",
       "integrity": "sha1-I8Lzt1b/38YI0w4nyalBAkgH5/k=",
       "dev": true
     },
-    "node_modules/eruda": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmmirror.com/eruda/-/eruda-3.0.1.tgz",
-      "integrity": "sha512-6q1Xdwga4JTr1mKSW4mzuWSSbmXgqpm/8Wa1QGFGfCWRjC0bCQjbS4u06M1te1moucIS3hBLlbSTPWYH2W0qbQ=="
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/fs.realpath/download/fs.realpath-1.0.0.tgz",
@@ -230,11 +204,6 @@
         "node": "*"
       }
     },
-    "node_modules/mutation-observer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz",
-      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
-    },
     "node_modules/nan": {
       "version": "2.15.0",
       "resolved": "https://registry.npmmirror.com/nan/download/nan-2.15.0.tgz",
@@ -305,11 +274,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
-    },
     "node_modules/resolve": {
       "version": "1.21.0",
       "resolved": "https://registry.npmmirror.com/resolve/download/resolve-1.21.0.tgz",
@@ -435,17 +399,6 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "node_modules/vconsole": {
-      "version": "3.14.7",
-      "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.14.7.tgz",
-      "integrity": "sha512-48byrra1sZk0zJfUM8HFN/ZKtMzvd7Sirt2h5Hfnf7txKOxL9JfoFKB2uLixmOF3jjxCpwnLLb1tsHlg4YzoyA==",
-      "dependencies": {
-        "@babel/runtime": "^7.17.2",
-        "copy-text-to-clipboard": "^3.0.1",
-        "core-js": "^3.11.0",
-        "mutation-observer": "^1.0.3"
-      }
-    },
     "node_modules/weixin-jsapi": {
       "version": "1.1.0",
       "resolved": "https://registry.npm.taobao.org/weixin-jsapi/download/weixin-jsapi-1.1.0.tgz",
@@ -459,14 +412,6 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.19.0.tgz",
-      "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
-      "requires": {
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
     "asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmmirror.com/asn1/download/asn1-0.2.6.tgz?cache=0&sync_timestamp=1635986760581&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fasn1%2Fdownload%2Fasn1-0.2.6.tgz",
@@ -525,16 +470,6 @@
         "typedarray": "^0.0.6"
       }
     },
-    "copy-text-to-clipboard": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz",
-      "integrity": "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q=="
-    },
-    "core-js": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.21.1.tgz",
-      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="
-    },
     "cpu-features": {
       "version": "0.0.2",
       "resolved": "https://registry.npmmirror.com/cpu-features/download/cpu-features-0.0.2.tgz",
@@ -550,17 +485,17 @@
       "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz",
       "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
     },
+    "dayjs": {
+      "version": "1.11.10",
+      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz",
+      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+    },
     "err-code": {
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/err-code/download/err-code-2.0.3.tgz",
       "integrity": "sha1-I8Lzt1b/38YI0w4nyalBAkgH5/k=",
       "dev": true
     },
-    "eruda": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmmirror.com/eruda/-/eruda-3.0.1.tgz",
-      "integrity": "sha512-6q1Xdwga4JTr1mKSW4mzuWSSbmXgqpm/8Wa1QGFGfCWRjC0bCQjbS4u06M1te1moucIS3hBLlbSTPWYH2W0qbQ=="
-    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/fs.realpath/download/fs.realpath-1.0.0.tgz",
@@ -641,11 +576,6 @@
         "brace-expansion": "^1.1.7"
       }
     },
-    "mutation-observer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz",
-      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
-    },
     "nan": {
       "version": "2.15.0",
       "resolved": "https://registry.npmmirror.com/nan/download/nan-2.15.0.tgz",
@@ -704,11 +634,6 @@
         "resolve": "^1.1.6"
       }
     },
-    "regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
-    },
     "resolve": {
       "version": "1.21.0",
       "resolved": "https://registry.npmmirror.com/resolve/download/resolve-1.21.0.tgz",
@@ -810,17 +735,6 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "vconsole": {
-      "version": "3.14.7",
-      "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.14.7.tgz",
-      "integrity": "sha512-48byrra1sZk0zJfUM8HFN/ZKtMzvd7Sirt2h5Hfnf7txKOxL9JfoFKB2uLixmOF3jjxCpwnLLb1tsHlg4YzoyA==",
-      "requires": {
-        "@babel/runtime": "^7.17.2",
-        "copy-text-to-clipboard": "^3.0.1",
-        "core-js": "^3.11.0",
-        "mutation-observer": "^1.0.3"
-      }
-    },
     "weixin-jsapi": {
       "version": "1.1.0",
       "resolved": "https://registry.npm.taobao.org/weixin-jsapi/download/weixin-jsapi-1.1.0.tgz",

package.json

@@ -15,10 +15,9 @@
   "license": "ISC",
   "dependencies": {
     "crypto-js": "^4.1.1",
-    "eruda": "^3.0.1",
+    "dayjs": "^1.11.10",
     "js-base64": "^3.7.5",
     "spinkit": "^2.0.1",
-    "vconsole": "^3.14.7",
     "weixin-jsapi": "^1.1.0"
   },
   "devDependencies": {

pages/quiltWashing/quiltWashingSendsendHandover/quiltWashingSendsendHandover.vue

@@ -5,7 +5,7 @@
         <view class="text1"> 领取交接 </view>
       </view>
       <view class="Scanning_top_text">
-        以下为<strong class="red">{{dept && dept.dept}}</strong>需要领取的被服信息，请确认
+        <strong class="red">{{dept && dept.dept}}</strong>领取，以下为前<strong class="red">{{differenceInDays}}</strong>天内<strong class="red">{{batchNum}}</strong>批次的被服
       </view>
     </view>
 
@@ -68,9 +68,15 @@
     SM,
     webHandle
   } from "../../../http/http.js";
+  import dayjs from 'dayjs';
   export default {
     data() {
       return {
+        batchIds: '',
+        startTime: '',
+        endTime: '',
+        differenceInDays: '',
+        batchNum: '',
         SMFlag: true,
         hosId: uni.getStorageSync('userData').user.currentHospital.id,
         queryObj: {}, //路由传递过来的数据
@@ -107,7 +113,7 @@
           orderId: 0,
           // bussList,
           index: this.dataList[0].children[0].clothesWashingDTO.index,
-          batchId: this.dataList[0].children[0].clothesWashingDTO.batchId,
+          batchIds: this.batchIds,
         }).then((res) => {
           uni.hideLoading();
           if (res.data && res.data.state == 200) {
@@ -140,7 +146,7 @@
       showModel1() {
         let bussList = this.dataList.map(v => v.children).flat();
         let num = bussList.reduce((prev, current) => prev + current.clothesWashingDTO.sendBackNum, 0);
-        let content = `您确认与<strong class="red">${this.handover ? this.handover.name : ''}</strong>交接，<strong class="red">${this.dept ? this.dept.dept : ''}</strong><strong class="red">${num}件</strong>被服吗？`;
+        let content = `您确认与<strong class="red">${this.handover ? this.handover.name : ''}</strong>交接，<strong class="red">${dayjs(this.startTime).format('YYYY年MM月DD日')}</strong>至<strong class="red">${dayjs(this.endTime,).format('YYYY年MM月DD日')}</strong>范围内<strong class="red">${this.batchNum}</strong>批次<strong class="red">${num}</strong>件被服？`;
         this.models1 = {
           disjunctor: true,
           title: "提示",
@@ -171,6 +177,11 @@
           uni.hideLoading();
           if (result.data && result.data.state == 200) {
             this.dept = result.data.dept;
+            this.batchNum = result.data.batchNum;
+            this.startTime = result.data.startTime;
+            this.endTime = result.data.endTime;
+            this.batchIds = result.data.batchIds;
+            this.differenceInDays = dayjs(result.data.endTime).diff(result.data.startTime, 'day');
             this.handover = result.data.handover;
             let dataList = result.data.treeList || [];
             dataList.forEach(v => {