فهرست منبع

版本升级3.0.6,修复仓库标签打印

liangzhicheng 2 سال پیش
والد
کامیت
764d516d12
3فایلهای تغییر یافته به همراه27 افزوده شده و 48 حذف شده
  1. 2 2
      package.json
  2. 13 25
      src/components/InventoryPrint.vue
  3. 12 21
      src/components/InventoryPrintScan.vue

+ 2 - 2
package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-wms-v3",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",
@@ -15,7 +15,7 @@
   "peerDependencies": {
     "ant-design-vue": "^3.2.15",
     "moment": "^2.29.4",
-    "pc-component-v3": "^1.0.69",
+    "pc-component-v3": "^1.0.70",
     "v-tooltip": "^4.0.0-beta.17",
     "vue-select": "^4.0.0-beta.6"
   },

+ 13 - 25
src/components/InventoryPrint.vue

@@ -10,6 +10,7 @@
             <PrintWidget
               ref="printWidget"
               :printer-localstorage-id="'#InventoryPrinterPrinter'"
+              @selected-printer-name="getPrintName"
             />
 
             <div class="form-group">
@@ -212,28 +213,11 @@ import Common from '../common/Common.js';
 
 import InventoryResource from '../api/common/InventoryResource.js';
 import InventoryInstancePrintResource from '../api/wms/InventoryInstancePrintResource.js';
-import { PrintUtil } from 'pc-component-v3';
-
-
-
-
-
-
-
-
-
-
-
+import { PrintUtil, PrintWidget } from 'pc-component-v3';
 
 export default {
   components: {
-    
-    
-    
-    
-    
-    
-    
+    PrintWidget,
     
   },
   data: function () {
@@ -263,6 +247,7 @@ export default {
       printType: 0, //类型 0:采购入库打印/1:扫描入库打印
       printerName: '',
       loading: false,
+      selectedPrinterTitle:'',
     };
   },
 
@@ -282,6 +267,11 @@ export default {
   },
 
   methods: {
+
+    getPrintName:function(value){
+      this.selectedPrinterTitle = value;
+    },
+
     getFieldValue1: function (item) {
       var fieldValue1 = {
         id: item.vendorId,
@@ -341,8 +331,7 @@ export default {
         return;
       }
 
-      let selectedPrinter = _self.$refs.printWidget.getSelectedPrinterName();
-      console.log(selectedPrinter);
+      let selectedPrinter = this.selectedPrinterTitle;
       if (selectedPrinter == null || selectedPrinter.length == 0) {
         Notify.error('提示', '请先选择打印机。', false);
         return;
@@ -418,8 +407,7 @@ export default {
         return;
       }
 
-      let selectedPrinter = _self.$refs.printWidget.getSelectedPrinterName();
-      console.log(selectedPrinter);
+      let selectedPrinter = this.selectedPrinterTitle;
       if (selectedPrinter == null || selectedPrinter.length == 0) {
         Notify.error('提示', '请先选择打印机。', false);
         return;
@@ -560,8 +548,8 @@ export default {
         baseListResponse => {
           _self.loading=false;
           if (baseListResponse.errorCode == 0) {
-            let selectedPrinter = _self.$refs.printWidget.getSelectedPrinterName();
-            let selectedPrinterType = _self.$refs.printWidget.getSelectedPrinterType();
+            let selectedPrinter = this.selectedPrinterTitle;
+            let selectedPrinterType = _self.$refs.printWidget.getSelectedPrinterTypeTitle();
             _self.printerName = selectedPrinter;
             if (selectedPrinterType == '发卡机' || selectedPrinterType == 'Jw发卡机') {
               _self.$nextTick(function () {

+ 12 - 21
src/components/InventoryPrintScan.vue

@@ -21,6 +21,7 @@
             <PrintWidget
               ref="printWidget"
               :printer-localstorage-id="'#InventoryPrinterPrinter'"
+              @selected-printer-name="getPrintName"
             />
 
             <div class="form-group">
@@ -249,25 +250,11 @@ import Common from '../common/Common.js';
 
 import InventoryResource from '../api/common/InventoryResource.js';
 import InventoryInstancePrintResource from '../api/wms/InventoryInstancePrintResource.js';
-import { PrintUtil } from 'pc-component-v3';
-
-
-
-
-
-
-
-
+import { PrintUtil,PrintWidget } from 'pc-component-v3';
 
 export default {
   components: {
-    
-    
-    
-    
-    
-    
-     
+    PrintWidget,
   },
   data: function () {
     this.Common = Common;
@@ -296,6 +283,7 @@ export default {
       printType: 1,//类型 0:采购入库打印/1:扫描入库打印
       printerName: '',
       loading: false,
+      selectedPrinterTitle:'',
     };
   },
 
@@ -316,6 +304,10 @@ export default {
 
   methods: {
 
+    getPrintName:function(value){
+      this.selectedPrinterTitle = value;
+    },
+
     getFieldValue1: function (item) {
       var fieldValue1 = {
         id: item.vendorId,
@@ -376,7 +368,7 @@ export default {
         return;
       }
 
-      let selectedPrinter = _self.$refs.printWidget.getSelectedPrinterName();
+      let selectedPrinter = this.selectedPrinterTitle;
       if (selectedPrinter == null || selectedPrinter.length == 0) {
         Notify.error('提示', '请先选择打印机。', false);
         return;
@@ -445,12 +437,11 @@ export default {
         return;
       }
 
-      let selectedPrinter = _self.$refs.printWidget.getSelectedPrinterName();
+      let selectedPrinter = this.selectedPrinterTitle;
       if (selectedPrinter == null || selectedPrinter.length == 0) {
         Notify.error('提示', '请先选择打印机。', false);
         return;
       }
-
       var datas = [];
       datas.push(inventoryInstance);
       $.ajax({
@@ -580,8 +571,8 @@ export default {
       InventoryInstancePrintResource.print(recordIds).then(baseListResponse => {
         _self.loading=false;
         if (baseListResponse.errorCode == 0) {
-          let selectedPrinter = _self.$refs.printWidget.getSelectedPrinterName();
-          let selectedPrinterType = _self.$refs.printWidget.getSelectedPrinterType();
+          let selectedPrinter = this.selectedPrinterTitle;
+          let selectedPrinterType = _self.$refs.printWidget.getSelectedPrinterTypeTitle();
           _self.printerName = selectedPrinter;
           if (selectedPrinterType == '发卡机') {
             _self.$nextTick(function(){