diff --git a/jshERP-web/package.json b/jshERP-web/package.json index 09e37331..156562a8 100644 --- a/jshERP-web/package.json +++ b/jshERP-web/package.json @@ -12,6 +12,7 @@ "ant-design-vue": "1.5.2", "area-data": "^5.0.6", "axios": "^0.18.0", + "chinese-to-pinyin": "^1.0.2", "clipboard": "^2.0.4", "codemirror": "^5.46.0", "dayjs": "^1.8.0", @@ -36,8 +37,7 @@ "vue-router": "^3.0.1", "vue-splitpane": "^1.0.4", "vuedraggable": "^2.20.0", - "vuex": "^3.1.0", - "chinese-to-pinyin": "^1.0.2" + "vuex": "^3.1.0" }, "devDependencies": { "@babel/polyfill": "^7.2.5", diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 7e1498c4..d1e0ea6b 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -78,12 +78,27 @@ export const BillModalMixin = { this.width = realScreenWidth<1500?'1200px':'1550px' this.minWidth = realScreenWidth<1500?1150:1500 }, + mounted() { + document.getElementById(this.prefixNo).addEventListener('keydown', this.handleOkKey) + }, + beforeDestroy() { + document.getElementById(this.prefixNo).removeEventListener('keydown', this.handleOkKey) + }, computed: { readOnly: function() { return this.action !== "add" && this.action !== "edit"; } }, methods: { + // 快捷键 + handleOkKey(e) { + const key = window.event.keyCode ? window.event.keyCode : window.event.which + if (key === 83 && e.ctrlKey) { + //保存 CTRL+S + this.handleOk() + e.preventDefault() + } + }, addInit(amountNum) { getAction('/sequence/buildNumber').then((res) => { if (res && res.code === 200) { diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue index 9e154d3b..686af4d6 100644 --- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue +++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue @@ -6,15 +6,17 @@ :confirmLoading="confirmLoading" :keyboard="false" :forceRender="true" + v-bind:prefixNo="prefixNo" fullscreen switchFullscreen @cancel="handleCancel" + :id="prefixNo" style="top:20px;height: 95%;"> diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue index a1587b41..e4a64eda 100644 --- a/jshERP-web/src/views/bill/modules/AssembleModal.vue +++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue @@ -6,15 +6,17 @@ :confirmLoading="confirmLoading" :keyboard="false" :forceRender="true" + v-bind:prefixNo="prefixNo" fullscreen switchFullscreen @cancel="handleCancel" + :id="prefixNo" style="top:20px;height: 95%;"> diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue index 50140931..1d691ed3 100644 --- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue +++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue @@ -6,15 +6,17 @@ :confirmLoading="confirmLoading" :keyboard="false" :forceRender="true" + v-bind:prefixNo="prefixNo" fullscreen switchFullscreen @cancel="handleCancel" + :id="prefixNo" style="top:20px;height: 95%;"> diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue index 63c20cd6..6d732fce 100644 --- a/jshERP-web/src/views/bill/modules/OtherInModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue @@ -6,15 +6,17 @@ :confirmLoading="confirmLoading" :keyboard="false" :forceRender="true" + v-bind:prefixNo="prefixNo" fullscreen switchFullscreen @cancel="handleCancel" + :id="prefixNo" style="top:20px;height: 95%;"> diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue index 5ce1de13..d49d0d10 100644 --- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue @@ -6,15 +6,17 @@ :confirmLoading="confirmLoading" :keyboard="false" :forceRender="true" + v-bind:prefixNo="prefixNo" fullscreen switchFullscreen @cancel="handleCancel" + :id="prefixNo" style="top:20px;height: 95%;"> diff --git a/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue b/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue index 45645580..cb2ba833 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue @@ -17,7 +17,7 @@ 取消 三联打印预览 保存并审核 - 保存 + 保存(Ctrl+S) 提交流程 diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index 5414d942..49032435 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -6,15 +6,17 @@ :confirmLoading="confirmLoading" :keyboard="false" :forceRender="true" + v-bind:prefixNo="prefixNo" fullscreen switchFullscreen @cancel="handleCancel" + :id="prefixNo" style="top:20px;height: 95%;"> diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index f00a2a60..6e230b2c 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -17,7 +17,7 @@ 取消 三联打印预览 保存并审核 - 保存 + 保存(Ctrl+S) 提交流程 diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index d3a39f12..d724fa14 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -17,7 +17,7 @@ 取消 三联打印预览 保存并审核 - 保存 + 保存(Ctrl+S) 提交流程 diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index 4471f1fb..5b97a2ed 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -6,15 +6,17 @@ :confirmLoading="confirmLoading" :keyboard="false" :forceRender="true" + v-bind:prefixNo="prefixNo" fullscreen switchFullscreen @cancel="handleCancel" + :id="prefixNo" style="top:20px;height: 95%;"> diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue index 50c3e976..86528c0b 100644 --- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue @@ -17,7 +17,7 @@ 取消 三联打印预览 保存并审核 - 保存 + 保存(Ctrl+S) 提交流程 diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index 93185ca3..3ab04910 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -6,15 +6,17 @@ :confirmLoading="confirmLoading" :keyboard="false" :forceRender="true" + v-bind:prefixNo="prefixNo" fullscreen switchFullscreen @cancel="handleCancel" + :id="prefixNo" style="top:20px;height: 95%;"> diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue index 9b9bb95e..2f497a4e 100644 --- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue @@ -17,7 +17,7 @@ 取消 三联打印预览 保存并审核 - 保存 + 保存(Ctrl+S) 提交流程 diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index b5e6c408..cfef8ea6 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -17,7 +17,7 @@ 取消 三联打印预览 保存并审核 - 保存 + 保存(Ctrl+S) 提交流程