add

pages/tally/index.vue

@@ -213,7 +213,7 @@
                 fixBoxStyle: '',
                 fixBoxStyle: '',
                 noexebshowFalg: true, //控制是否会触发生命周期
                 noexebshowFalg: true, //控制是否会触发生命周期
                 index: 0,
                 index: 0,
-                item: ['其他', 'digikey', 'mouser', 'future', 'TI'],
+                item: ['其他', 'DigiKey', 'Rochester', 'TME', 'Chip1stop', 'Mouser'],
                 box_sn: '', //箱号信息
                 box_sn: '', //箱号信息
                 wsty_id: '', //箱子id
                 wsty_id: '', //箱子id
                 erp_order_sn: '', //入仓号
                 erp_order_sn: '', //入仓号
@@ -429,18 +429,18 @@
                     this.getTallyData();
                     this.getTallyData();
                 } else {
                 } else {
                     let codeTypeByIndex = {
                     let codeTypeByIndex = {
-                        3: 'DigiKey',
-                        4: 'Rochester',
-                        5: 'TME',
-                        6: 'Chip1stop',
-                        7: 'Mouser'
+                        1: 'DigiKey',
+                        2: 'Rochester',
+                        3: 'TME',
+                        4: 'Chip1stop',
+                        5: 'Mouser'
                     };
                     };
                     let codeType = codeTypeByIndex[this.index] || '';
                     let codeType = codeTypeByIndex[this.index] || '';
                     let device = uni.getDeviceInfo();
                     let device = uni.getDeviceInfo();
                     //匹配到内容才开始调接口
                     //匹配到内容才开始调接口
                     if (!this.isRequestSent) {
                     if (!this.isRequestSent) {
                         this.isRequestSent = true; // 设置标志，防止重复发送请求
                         this.isRequestSent = true; // 设置标志，防止重复发送请求
-                        this.request(API.identifyQrCodeNumAndSn, 'POST', { data: this.keyword, type: codeType, device: device.deviceModel }, true).then(res => {
+                        this.request(API.scanQrCode, 'POST', { data: this.keyword, type: codeType, device: device.deviceModel }, true).then(res => {
                             this.isRequestSent = false; // 请求完成后重置标志
                             this.isRequestSent = false; // 请求完成后重置标志
                             if (res.code === 0) {
                             if (res.code === 0) {
                                 //如果后台搜索到型号则替换输入框的值
                                 //如果后台搜索到型号则替换输入框的值

util/api.js

@@ -183,6 +183,10 @@ const API = {
      */
      */
     identifyQrCodeNumAndSn: API_BASE + '/supplywechatwms/identifyQrCodeNumAndSn',
     identifyQrCodeNumAndSn: API_BASE + '/supplywechatwms/identifyQrCodeNumAndSn',
     /**
     /**
+     * 识别二维码数量和型号
+     */
+    scanQrCode: API_BASE + '/supplywechatwms/scanQrCode',
+    /**
      * 提交当前箱号的数据
      * 提交当前箱号的数据
      */
      */
     submitBoxSnAndNum: API_BASE + '/supplywechatwms/submitBoxSnAndNum',
     submitBoxSnAndNum: API_BASE + '/supplywechatwms/submitBoxSnAndNum',