bug

pages/goods/addExectionReceiving.vue

@@ -21,7 +21,7 @@
                     <view class="tab-panel row rowCenter verCenter" @click="change(index, 'delivery_method')" :class="{ curr: delivery_method_index == index }" v-for="(item, index) in delivery_method_arr" :key="index">{{ item }}</view>
                 </view>
             </view>
-            <view class="box row verCenter">
+            <view class="box row verCenter" v-if="delivery_method_index == 0">
                 <text class="label">物流信息</text>
                 <view class="uni-input-box row bothSide">
                     <input type="text" class="uni-input" placeholder="请扫描或者手动录入" placeholder-style="color:#404547;font-weight:bold;" v-model="form.logistics_number" />
@@ -31,7 +31,7 @@
                     </view>
                 </view>
             </view>
-            <view class="box row verCenter">
+            <view class="box row verCenter" v-if="delivery_method_index == 0">
                 <text class="label">物流公司</text>
                 <view class="uni-list-cell-db">
                     <text class="iconfont icon-sanjiaoxing1"></text>

pages/goods/addReceiving.vue

@@ -34,7 +34,7 @@
                     </view>
                 </view>
             </view>
-            <view class="box row verCenter">
+            <view class="box row verCenter" v-if="currentIndex == 0">
                 <text class="label">物流公司</text>
                 <view class="uni-list-cell-db">
                     <text class="iconfont icon-sanjiaoxing1"></text>
@@ -43,7 +43,7 @@
                     </picker>
                 </view>
             </view>
-            <view class="box row verCenter">
+            <view class="box row verCenter" v-if="currentIndex == 0">
                 <text class="label">物流单号</text>
                 <view class="uni-input-box row bothSide">
                     <input type="text" class="uni-input" placeholder="请输入物流单号" placeholder-style="color:#404547;font-weight:bold;" v-model="form.logistics_number" />
@@ -112,11 +112,6 @@ export default {
     onLoad(options) {
         this.id = options.number;
     },
-    onShow() {
-        if (this.noexebshowFalg) {
-            this.getData();
-        }
-    },
     methods: {
         getData() {
             this.request(API.getCheckInList, 'POST', { number: this.id }, this.loading).then(res => {
@@ -254,22 +249,24 @@ export default {
                 return false;
             }
 
-            if (!this.form.logistics_company) {
-                uni.showModal({
-                    title: '提示',
-                    content: '请选择物流公司',
-                    showCancel: false
-                });
-                return false;
-            }
+            if (this.currentIndex == 0) {
+                if (!this.form.logistics_company) {
+                    uni.showModal({
+                        title: '提示',
+                        content: '请选择物流公司',
+                        showCancel: false
+                    });
+                    return false;
+                }
 
-            if (!this.form.logistics_number) {
-                uni.showModal({
-                    title: '提示',
-                    content: '请输入物流单号',
-                    showCancel: false
-                });
-                return false;
+                if (!this.form.logistics_number) {
+                    uni.showModal({
+                        title: '提示',
+                        content: '请输入物流单号',
+                        showCancel: false
+                    });
+                    return false;
+                }
             }
 
             this.form.erp_order_sn = titleCase(this.form.erp_order_sn); //自动转成大写

pages/tag/print.vue

@@ -221,9 +221,9 @@ export default {
                         data.push('T 5 0 10 120  箱号：' + this.printLabelData[this.print_number].label_sort + '/' + this.printLabelData[this.print_number].label_num + '\r\n');
                     }
                     data.push('SETMAG 0 0\r\n');
-                    data.push('T 8 0 10 190 时间：' + this.printLabelData[this.print_number].create_time_cn + '\r\n');
-                    data.push('T 8 0 10 230 仓库代码：' + this.printLabelData[this.print_number].warehouse_code + '\r\n');
-                    data.push('T 8 0 10 270 流水号：' + this.printLabelData[this.print_number].wstyptll_id_sn + '\r\n');
+                    data.push('T 8 0 10 180 时间：' + this.printLabelData[this.print_number].create_time_cn + '\r\n');
+                    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('ENDQR\r\n');

pages/tag/repairPrint.vue

@@ -200,9 +200,9 @@ export default {
                         data.push('T 5 0 10 120  箱号：' + this.printLabelData[this.print_number].label_sort + '/' + this.printLabelData[this.print_number].label_num + '\r\n');
                     }
                     data.push('SETMAG 0 0\r\n');
-                    data.push('T 8 0 10 190 时间：' + this.printLabelData[this.print_number].create_time_cn + '\r\n');
-                    data.push('T 8 0 10 230 仓库代码：' + this.printLabelData[this.print_number].warehouse_code + '\r\n');
-                    data.push('T 8 0 10 270 流水号：' + this.printLabelData[this.print_number].wstyptll_id_sn + '\r\n');
+                    data.push('T 8 0 10 180 时间：' + this.printLabelData[this.print_number].create_time_cn + '\r\n');
+                    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('ENDQR\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 = {
     /**
      *  上传数据