Merge branch 'fix/handa/20230524_late_print'

# Conflicts:
#	pages/repairPrint/index.vue

pages/index/index.vue

@@ -74,6 +74,7 @@ export default {
             this.request(API.getStatisticsInfo, 'POST', {}, false).then(res => {
             this.request(API.getStatisticsInfo, 'POST', {}, false).then(res => {
                 if (res.code === 0) {
                 if (res.code === 0) {
                     this.info = res.data;
                     this.info = res.data;
+                    uni.setStorageSync('oa_user_email', res.data.user_info.email);
                 }
                 }
             });
             });
         },
         },
@@ -87,6 +88,7 @@ export default {
                         uni.removeStorageSync('oa_skey');
                         uni.removeStorageSync('oa_skey');
                         uni.removeStorageSync('oa_user_id');
                         uni.removeStorageSync('oa_user_id');
                         uni.removeStorageSync('company_id');
                         uni.removeStorageSync('company_id');
+                        uni.removeStorageSync('oa_user_email');
                         uni.redirectTo({
                         uni.redirectTo({
                             url: '/pages/mine/login'
                             url: '/pages/mine/login'
                         });
                         });

pages/repairPrint/index.vue

@@ -56,6 +56,7 @@ import debounce from 'lodash/debounce';
 export default {
 export default {
     data() {
     data() {
         return {
         return {
+            company_id: 1,
             input_flag: false,
             input_flag: false,
             input_flag_num: false,
             input_flag_num: false,
             index: 0,
             index: 0,
@@ -82,9 +83,10 @@ export default {
                 }
                 }
             ],
             ],
             formParams: {
             formParams: {
+                user_email: '', // 登录账号邮箱
+                warehouse_id: '', // 登录仓库
                 sn: '',
                 sn: '',
-                origin_device_ip: '', //获取设备内网IP
-                target_printer: '', //模板打印机
+                target_printer_ip: '', //模板打印机
                 tally_qty: '', //打印数量
                 tally_qty: '', //打印数量
                 type: 5 //库位 1；库区 2；区域 3； 容器 4；入库 5  默认5
                 type: 5 //库位 1；库区 2；区域 3； 容器 4；入库 5  默认5
             }
             }
@@ -155,6 +157,17 @@ export default {
                 this.formParams.tally_qty = 1;
                 this.formParams.tally_qty = 1;
             }
             }
 
 
+            this.formParams.user_email = uni.getStorageSync('oa_user_email') || '';
+
+            // company_id == 1 ? '深圳市猎芯科技有限公司' : '深贸电子有限公司'
+            this.company_id = uni.getStorageSync('company_id') || 1;
+            // 7 深圳仓, 10 香港仓
+            if (this.company_id == 1) {
+                this.formParams.warehouse_id = 7;
+            } else {
+                this.formParams.warehouse_id = 10;
+            }
+
             this.request(API.latePrint, 'POST', this.formParams, true).then(res => {
             this.request(API.latePrint, 'POST', this.formParams, true).then(res => {
                 if (res.code === 0) {
                 if (res.code === 0) {
                     uni.showLoading({
                     uni.showLoading({