kjs

pages/goods/addReceiving.vue

@@ -280,15 +280,22 @@ export default {
 
             this.request(API.addCheckIn, 'POST', this.form, true).then(res => {
                 if (res.err_code === 0) {
-                    uni.showToast({
-                        title: res.err_msg,
-                        icon: 'success'
-                    });
+                    uni.showModal({
+                        title: '提示',
+                        content: res.err_msg,
+                        showCancel: false,
+                        success: res => {
+                            if (res.confirm) {
                                 setTimeout(() => {
                                     uni.navigateBack({
                                         delta: 1
                                     });
                                 }, 2000);
+                            } else if (res.cancel) {
+                                console.log('用户点击取消');
+                            }
+                        }
+                    });
                 } else {
                     uni.showModal({
                         title: '提示',

pages/tag/print.vue

@@ -225,7 +225,7 @@ export default {
                     data.push('T 8 0 10 220 仓库代码：' + this.printLabelData[this.print_number].warehouse_code + '\r\n');
                     data.push('T 8 0 10 260 流水号：' + this.printLabelData[this.print_number].wstyptll_id_sn + '\r\n');
                     data.push('B QR 280 110 M 2 U 8\r\n');
-                    data.push('MA,' + this.printLabelData[this.print_number].erp_order_sn + '|\r\n');
+                    data.push('MA,' + this.printLabelData[this.print_number]['box_code'] + '|\r\n');
                     data.push('ENDQR\r\n');
                     data.push('FORM\r\n');
                     data.push('PRINT\r\n');

pages/tag/repairPrint.vue

@@ -204,7 +204,7 @@ export default {
                     data.push('T 8 0 10 220 仓库代码：' + this.printLabelData[this.print_number].warehouse_code + '\r\n');
                     data.push('T 8 0 10 260 流水号：' + this.printLabelData[this.print_number].wstyptll_id_sn + '\r\n');
                     data.push('B QR 280 110 M 2 U 8\r\n');
-                    data.push('MA,' + this.printLabelData[this.print_number].erp_order_sn + '|\r\n');
+                    data.push('MA,' + this.printLabelData[this.print_number].box_code + '|\r\n');
                     data.push('ENDQR\r\n');
                     data.push('FORM\r\n');
                     data.push('PRINT\r\n');

util/api.js

-const API_BASE = 'https://api.ichunt.com';
-//const API_BASE = 'http://api.liexin.com'
+//const API_BASE = 'https://api.ichunt.com';
+const API_BASE = 'http://api.liexin.com'
 const API = {
     /**
      *  上传数据