bug

manifest.json

@@ -2,7 +2,7 @@
     "name" : "wms",
     "appid" : "__UNI__655E80D",
     "description" : "供应链仓储App",
-    "versionName" : "2.2.1",
+    "versionName" : "2.2.2",
     "versionCode" : 100000000,
     "transformPx" : false,
     /* 5+App特有相关 */

pages/stockRecheck/print.vue

@@ -370,15 +370,30 @@
             realShippChage(callback) {
                 let value = this.formParams.real_shipping_type; //交货方式
                 this.real_shipping_id_data = []; //物流公司
-                if (value == 1) {
-                    this.real_shipping_id_data.push({ name: '顺丰', value: 1 }, { name: '京东', value: 11 }, { name: '中通', value: 18 }, { name: '韵达', value: 5 });
-                } else if (value == 2) {
-                    this.real_shipping_id_data = [];
-                } else if (value == 3) {
-                    this.real_shipping_id_data.push({ name: '自提', value: 10 });
-                } else if (value == 4) {
-                    this.real_shipping_id_data.push({ name: '顺丰同城', value: 19 }, { name: '货拉拉', value: 20 }, { name: '跨越速运', value: 21 });
+                if (this.company_id == 1 || this.company_id == 3) {
+                    //猎芯和华云的逻辑
+                    if (value == 1) {
+                        this.real_shipping_id_data.push({ name: '顺丰', value: 1 }, { name: '京东', value: 11 }, { name: '中通', value: 18 }, { name: '韵达', value: 5 });
+                    } else if (value == 2) {
+                        this.real_shipping_id_data = [];
+                    } else if (value == 3) {
+                        this.real_shipping_id_data.push({ name: '自提', value: 10 });
+                    } else if (value == 4) {
+                        this.real_shipping_id_data.push({ name: '顺丰同城', value: 19 }, { name: '货拉拉', value: 20 }, { name: '跨越速运', value: 21 });
+                    }
+                } else {
+                    //深贸的逻辑
+                    if (value == 1) {
+                        this.real_shipping_id_data.push({ name: '顺丰', value: 1 }, { name: 'UPS', value: 17 }, { name: 'Fedex', value: 13 }, { name: 'TNT', value: 9 }, { name: 'DHL', value: 12 });
+                    } else if (value == 2) {
+                        this.real_shipping_id_data = [];
+                    } else if (value == 3) {
+                        this.real_shipping_id_data = [];
+                    } else if (value == 4) {
+                        this.real_shipping_id_data.push({ name: '顺丰', value: 1 }, { name: 'UPS', value: 17 }, { name: 'Fedex', value: 13 }, { name: 'TNT', value: 9 }, { name: 'DHL', value: 12 }, { name: '司机送货', value: 14 });
+                    }
                 }
+
                 typeof callback == 'function' && callback();
             },
             /**

util/api.js

-const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
-const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
-const API_BASE = 'http://wms.liexindev.net'; //WMS系统
-const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统
+// const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
+// const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
+// const API_BASE = 'http://wms.liexindev.net'; //WMS系统
+// const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统
 
-// const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
-// const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
-// const API_BASE = 'https://wms.ichunt.net'; //WMS系统
-// const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
+const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
+const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
+const API_BASE = 'https://wms.ichunt.net'; //WMS系统
+const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
 
 
 const API = {