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'){