Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

package-lock.json

@@ -160,9 +160,9 @@
       "dev": true
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.19.tgz",
-      "integrity": "sha512-Tinq7ybnEPFFXhlYOYFiSjespWQk0dq2dRNAiMdRTOYQzEGqnnNyrTxPYHP5r6wGjlF1rFgABdDV0g8EwD6Qbg==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true
     },
     "@babel/highlight": {
@@ -279,9 +279,9 @@
       "integrity": "sha512-zgPbRveW6fVBEda6P8TkMs9jOJyaxwtWm2uiqnz9eDxQQ1pdN6tI6yp7RH0Nh1yJ7kHBEdZIWvzHWPI+V5laGg=="
     },
     "@types/hammerjs": {
-      "version": "2.0.41",
-      "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.41.tgz",
-      "integrity": "sha512-ewXv/ceBaJprikMcxCmWU1FKyMAQ2X7a9Gtmzw8fcg2kIePI1crERDM818W+XYrxqdBBOdlf2rm137bU+BltCA=="
+      "version": "2.0.42",
+      "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.42.tgz",
+      "integrity": "sha512-Xxk14BrwHnGi0xlURPRb+Y0UNn2w3cTkeFm7pKMsYOaNgH/kabbJLhcBoNIodwsbTz7Z8KcWjtDvlGH0nc0U9w=="
     },
     "@types/json5": {
       "version": "0.0.29",
@@ -290,9 +290,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "20.6.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.1.tgz",
-      "integrity": "sha512-4LcJvuXQlv4lTHnxwyHQZ3uR9Zw2j7m1C9DfuwoTFQQP4Pmu04O6IfLYgMmHoOCt0nosItLLZAH+sOrRE0Bo8g==",
+      "version": "20.6.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.2.tgz",
+      "integrity": "sha512-Y+/1vGBHV/cYk6OI1Na/LHzwnlNCAfU3ZNGrc1LdRe/LAIbdDPTTv/HU3M7yXN448aTVDq3eKRm2cg7iKLb8gw==",
       "dev": true
     },
     "@types/q": {
@@ -314,9 +314,9 @@
       "dev": true
     },
     "@vant/icons": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.8.0.tgz",
-      "integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-3.0.0.tgz",
+      "integrity": "sha512-g0sNQGwq3xajpri698ql/MjeMZ0Bwptjf7WO+s5fZEPq4smesmwC8Jda1OetidBjI0cQ5c7cYqoNGlkQA81TMw=="
     },
     "@vant/popperjs": {
       "version": "1.3.0",
@@ -2499,15 +2499,15 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30001534",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001534.tgz",
-      "integrity": "sha512-c9MwxCx5880yBLBOUg0iMq65f/0MimUwFS5YqXN+bksCsfZBLbGN/lFyr9rcbAnJZZrBD55fh/zU0uZounCDLg==",
+      "version": "1.0.30001535",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001535.tgz",
+      "integrity": "sha512-GqX/YYHUWIiK3H9wneyTqg7yfcMcXJ8mKHzt/m3qzB+u4Q84mVEh00lkk6jVdiTgXkxZEVOOh2AQEtQsV3IkXA==",
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001534",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001534.tgz",
-      "integrity": "sha512-vlPVrhsCS7XaSh2VvWluIQEzVhefrUQcEsQWSS5A5V+dM07uv1qHeQzAOTGIMy9i3e9bH15+muvI/UHojVgS/Q==",
+      "version": "1.0.30001535",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001535.tgz",
+      "integrity": "sha512-48jLyUkiWFfhm/afF7cQPqPjaUmSraEhK4j+FCTJpgnGGEZHqyLe3hmWH7lIooZdSzXL0ReMvHz0vKDoTBsrwg==",
       "dev": true
     },
     "capture-exit": {
@@ -3198,9 +3198,9 @@
       }
     },
     "cropperjs": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.6.0.tgz",
-      "integrity": "sha512-BzLU/ecrfsbflwxgu+o7sQTrTlo52pVRZkTVrugEK5uyj6n8qKwAHP4s6+DWHqlXLqQ5B9+cM2MKeXiNfAsF6Q=="
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.6.1.tgz",
+      "integrity": "sha512-F4wsi+XkDHCOMrHMYjrTEE4QBOrsHHN5/2VsVAaRq8P7E5z7xQpT75S+f/9WikmBEailas3+yo+6zPIomW+NOA=="
     },
     "cross-env": {
       "version": "5.2.1",
@@ -11319,9 +11319,9 @@
       "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="
     },
     "postcss": {
-      "version": "8.4.29",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz",
-      "integrity": "sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==",
+      "version": "8.4.30",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz",
+      "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==",
       "requires": {
         "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
@@ -15631,9 +15631,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
-      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="
+      "version": "3.0.14",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.14.tgz",
+      "integrity": "sha512-U0eS5wcpu/O2/QZk6PcAMOA8H3ZuvRe4mFHA3Q+LNl1SRDmfQ+mD3RoD6tItqnvqubJ32m/zV2Z/ikSmxccD1Q=="
     },
     "spdy": {
       "version": "4.0.2",
@@ -17124,12 +17124,12 @@
       "integrity": "sha512-5SQeksiWaRYfbTaLVcqDPlvINGRt7ODbmWqqMMdT4GuZEC01KJm7FxaytscI5GZ9mlkTNQDwqllSHbv1ENxQEA=="
     },
     "vant": {
-      "version": "2.12.54",
-      "resolved": "https://registry.npmjs.org/vant/-/vant-2.12.54.tgz",
-      "integrity": "sha512-t7DCiLxNosDrg0Jm5EY9p0A5cAMo5OadmizbYtPEc0ru+OJKEa3kcfxtKIK5on7ZPqoOkyYJt8e6BQ1VDMPsrg==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/vant/-/vant-2.13.0.tgz",
+      "integrity": "sha512-dDsU9FkmWI/2jYCcKz+7zSp7/MUND4i961vipZ8Yg0VaXrCIyStSEaFDGYIieB+PsroG9LdwBvIFzZ+W+qcKPw==",
       "requires": {
         "@babel/runtime": "7.x",
-        "@vant/icons": "^1.7.1",
+        "@vant/icons": "^3.0.0",
         "@vant/popperjs": "^1.1.0",
         "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
         "vue-lazyload": "1.2.3"

src/pages/main/PrintIndex.vue

@@ -353,6 +353,12 @@
         v-bind:childResponse="childResponse"
         v-if="org_template_info.template_id == 67"
       ></DialysisPrintOrderSixtyseven>
+      <DialysisPrintOrderSixtyeight
+        ref="childOne"
+        style="margin-top: 60px"
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 68"
+      ></DialysisPrintOrderSixtyeight>
     </div>
     <!--<side-bar :active_index="0" v-if="isShow == true"></side-bar>-->
   </div>
@@ -413,6 +419,7 @@ import DialysisPrintOrderSixtyThree from "./template/DialysisPrintOrderSixtyThre
 import DialysisPrintOrdersixtyFive from './template/DialysisPrintOrdersixtyFive.vue'
 import DialysisPrintOrderSixtysix from "./template/DialysisPrintOrderSixtysix.vue"
 import DialysisPrintOrderSixtyseven from "./template/DialysisPrintOrdersixtyseven.vue"
+import DialysisPrintOrderSixtyeight from "./template/DialysisPrintOrdersixtyeight.vue"
 export default {
   name: "PrintIndex",
   components: {
@@ -422,6 +429,7 @@ export default {
     DialysisPrintOrderSixty,
     DialysisPrintOrderSixtysix,
     DialysisPrintOrderSixtyseven,
+    DialysisPrintOrderSixtyeight,
     DialysisPrintOrdersixtyFive,
     DialysisPrintOrderFiftyNine,
     DialysisPrintOrderFiftyEight,