条码管理列表PAD端：作废成功需增加弹窗

assets/css/font.css

@@ -11,6 +11,14 @@
     -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-juxing8:before {
+    content: "\e782";
+}
+
+.icon-jinggao3:before {
+    content: "\e783";
+}
+
 .icon-Chevron1:before {
     content: "\e769";
 }

pages/goods/barCode.vue

@@ -65,6 +65,9 @@ export default {
         this.getData();
     },
     onShow() {
+        this.total = 0;
+        this.page = 1;
+        this.erpOrderSnCodeManage = [];
         this.getData();
     },
     methods: {
@@ -97,7 +100,26 @@ export default {
                     if (res.confirm) {
                         this.request(API.delErpOrderSnCodeManage, 'POST', { erp_order_sn: erp_order_sn }, true).then(res => {
                             if (res.err_code === 0) {
-                                this.getData();
+                                uni.showModal({
+                                    title: '提示',
+                                    content: '作废操作成功',
+                                    cancelText: '重新打印',
+                                    confirmText: '关闭',
+                                    showCancel: true,
+                                    success: res => {
+                                        if (res.confirm) {
+                                            this.total = 0;
+                                            this.page = 1;
+                                            this.erpOrderSnCodeManage = [];
+                                            this.getData();
+                                        } else if (res.cancel) {
+                                            console.log('用户点击取消');
+                                            uni.navigateTo({
+                                                url: '/pages/tag/print?number=' + erp_order_sn
+                                            });
+                                        }
+                                    }
+                                });
                             } else {
                                 uni.showModal({
                                     title: '提示',

pages/home/index.vue

@@ -103,12 +103,12 @@ export default {
                 },
                 {
                     name: '条码管理',
-                    iconfont: 'icon-a-juxing4',
+                    iconfont: 'icon-juxing8',
                     tips: ''
                 },
                 {
-                    name: '装箱复核序蒲',
-                    iconfont: 'icon-a-juxing4',
+                    name: '装箱复核序簿',
+                    iconfont: 'icon-jinggao3',
                     tips: ''
                 }
             ]
@@ -183,7 +183,7 @@ export default {
                 uni.navigateTo({
                     url: '/pages/goods/barCode'
                 });
-            } else if (item.name == '装箱复核序蒲') {
+            } else if (item.name == '装箱复核序簿') {
                 uni.navigateTo({
                     url: '/pages/goods/rePackageList'
                 });

pages/tag/print.vue

@@ -49,6 +49,7 @@ const ToBase64 = require('../../util/base64gb2312.js');
 export default {
     data() {
         return {
+            number: '', //从条码管理列表过来的
             print_number: 0,
             serviceId: '',
             deviceId: '',
@@ -78,6 +79,22 @@ export default {
     onLoad(option) {
         this.platform = getPlatform();
 
+        //从条码管理列表过来的 赋值订单类型和入仓号
+        if (option.number) {
+            let str = option.number;
+            this.form.erp_order_sn_pre = str.charAt(0);
+            this.form.erp_order_sn_number = str.substring(1, str.length);
+            if (option.number.charAt(0) == 'A') {
+                this.index_erp_order_sn_pre = 0;
+            }
+            if (option.number.charAt(0) == 'B') {
+                this.index_erp_order_sn_pre = 1;
+            }
+            if (option.number.charAt(0) == 'D') {
+                this.index_erp_order_sn_pre = 2;
+            }
+        }
+
         //停止搜索，节省系统资源
         uni.stopBluetoothDevicesDiscovery({
             success: res => {