diff --git a/package.json b/package.json index 2eab1b28..2e764939 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "jsencrypt": "3.0.0-rc.1", "jszip": "^3.10.1", "nprogress": "0.2.0", + "print-js": "^1.6.0", "qrcodejs2": "^0.0.2", "quill": "1.3.7", "screenfull": "5.0.2", @@ -61,11 +62,11 @@ "vue": "2.6.12", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", + "vue-easy-print": "0.0.8", "vue-meta": "2.4.0", "vue-router": "3.4.9", "vuedraggable": "2.24.3", "vuex": "3.6.0", - "vue-easy-print": "0.0.8", "webstomp-client": "^1.2.6" }, "devDependencies": { diff --git a/src/api/lease/apply.js b/src/api/lease/apply.js index 9f51a18c..391497e0 100644 --- a/src/api/lease/apply.js +++ b/src/api/lease/apply.js @@ -135,3 +135,12 @@ export function uploadPurchaseFile(data) { } +// 出库检验单-详情信息 +export function getCheckInfo(data) { + return request({ + url: '/material/lease_apply_info/getInfo', + method: 'get', + params: data + }) +} + diff --git a/src/utils/chapter.js b/src/utils/chapter.js index 69871a34..52fc2747 100644 --- a/src/utils/chapter.js +++ b/src/utils/chapter.js @@ -1,5 +1,6 @@ let chapter = (text, companyName) => { let canvas = document.getElementById("canvas"); + if(canvas!=null){ let context = canvas.getContext("2d"); //let text = "XXX专用章"; @@ -68,6 +69,7 @@ let chapter = (text, companyName) => { context.fill(); context.restore(); } + } }; export default chapter; diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue index d3019454..007ba7ca 100644 --- a/src/views/material/lease/outBound/index.vue +++ b/src/views/material/lease/outBound/index.vue @@ -486,11 +486,12 @@ -
- +
+ +
领用工程: + {{ checkDataInfo.leaseProject }}
使用单位: + {{ checkDataInfo.leaseUnit }}
- - - - - - - - - - - - + + + + + + + + + + + +
-
+
- 检验单位:xxxxxxxx + 检验单位:
- +
- +
+
@@ -850,7 +855,7 @@