From 8b9154d4f63cb19392cf0a00813d78b72134768d Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Tue, 11 Feb 2025 17:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8D=AF=E5=93=81/=E5=99=A8=E6=A2=B0=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=B3=E8=B4=AD=E5=8D=95=20=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=92=8C=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                              | 3 ++-
 .../purApplyDrug/pureApplyDetailDialog.vue                | 8 ++++++--
 src/views/purchase/purApply/pureApplyDetailDialog.vue     | 5 ++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 81a45964..7e2b3bed 100644
--- a/package.json
+++ b/package.json
@@ -37,9 +37,9 @@
     "url": "https://gitee.com/y_project/RuoYi-Vue.git"
   },
   "dependencies": {
+    "@jiaminghi/data-view": "^2.10.0",
     "@riophae/vue-treeselect": "0.4.0",
     "@tinymce/tinymce-vue": "^3.2.8",
-    "@jiaminghi/data-view": "^2.10.0",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "^3.19.1",
@@ -52,6 +52,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "js-sha256": "^0.10.1",
+    "jsbarcode": "^3.11.6",
     "jsencrypt": "3.0.0-rc.1",
     "loadsh": "^0.0.4",
     "lodash": "^4.17.21",
diff --git a/src/views/pharmaceuticals/purApplyDrug/pureApplyDetailDialog.vue b/src/views/pharmaceuticals/purApplyDrug/pureApplyDetailDialog.vue
index 53ce0eac..623a9f85 100644
--- a/src/views/pharmaceuticals/purApplyDrug/pureApplyDetailDialog.vue
+++ b/src/views/pharmaceuticals/purApplyDrug/pureApplyDetailDialog.vue
@@ -229,7 +229,9 @@ export default {
                 audtoPlan: false,
                 targetSubInv:null,
                 createTime: "",
-              approvalFlowId: ""
+              approvalFlowId: "",
+              productType:null
+
             },
            targetSubInvList: [],
             formRules: {},
@@ -345,7 +347,9 @@ export default {
         submitFunction(status) {
             // this.loading = true;
             this.formData.status = status;
-            auditOrder(this.formData)//更新方法接口路径
+          this.formData.productType = 2;
+
+          auditOrder(this.formData)//更新方法接口路径
                 .then(response => {
                   if (status == '3'){
                     this.passLoading = false
diff --git a/src/views/purchase/purApply/pureApplyDetailDialog.vue b/src/views/purchase/purApply/pureApplyDetailDialog.vue
index c917f919..b192ed82 100644
--- a/src/views/purchase/purApply/pureApplyDetailDialog.vue
+++ b/src/views/purchase/purApply/pureApplyDetailDialog.vue
@@ -229,7 +229,8 @@ export default {
                 audtoPlan: false,
                 targetSubInv:null,
                 createTime: "",
-              approvalFlowId: ""
+              approvalFlowId: "",
+              productType:null
             },
            targetSubInvList: [],
             formRules: {},
@@ -345,6 +346,8 @@ export default {
         submitFunction(status) {
             // this.loading = true;
             this.formData.status = status;
+          this.formData.productType = 1;
+          console.log('productType', this.formData.productType)
             auditOrder(this.formData)//更新方法接口路径
                 .then(response => {
                   if (status == '3'){