Commit e12942db by LJM

dgk

parent 0af74252
{
"name" : "wms",
"appid" : "__UNI__655E80D",
"description" : "供应链仓储App",
"versionName" : "2.3.3",
"versionCode" : 100000000,
"transformPx" : false,
"name": "wms",
"appid": "__UNI__655E80D",
"description": "供应链仓储App",
"versionName": "2.3.5",
"versionCode": 100000000,
"transformPx": false,
/* 5+App特有相关 */
"app-plus" : {
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
"app-plus": {
"usingComponents": true,
"nvueStyleCompiler": "uni-app",
"compilerVersion": 3,
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
},
/* 模块配置 */
"modules" : {
"Camera" : {},
"Barcode" : {},
"Bluetooth" : {}
"modules": {
"Camera": {},
"Barcode": {},
"Bluetooth": {}
},
/* 应用发布信息 */
"distribute" : {
"distribute": {
/* android打包配置 */
"android" : {
"permissions" : [
"android": {
"permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
......@@ -45,86 +45,86 @@
]
},
/* ios打包配置 */
"ios" : {
"dSYMs" : false
"ios": {
"dSYMs": false
},
/* SDK配置 */
"sdkConfigs" : {
"ad" : {}
"sdkConfigs": {
"ad": {}
},
"icons" : {
"android" : {
"hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png"
"icons": {
"android": {
"hdpi": "unpackage/res/icons/72x72.png",
"xhdpi": "unpackage/res/icons/96x96.png",
"xxhdpi": "unpackage/res/icons/144x144.png",
"xxxhdpi": "unpackage/res/icons/192x192.png"
},
"ios" : {
"appstore" : "unpackage/res/icons/1024x1024.png",
"ipad" : {
"app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png"
"ios": {
"appstore": "unpackage/res/icons/1024x1024.png",
"ipad": {
"app": "unpackage/res/icons/76x76.png",
"app@2x": "unpackage/res/icons/152x152.png",
"notification": "unpackage/res/icons/20x20.png",
"notification@2x": "unpackage/res/icons/40x40.png",
"proapp@2x": "unpackage/res/icons/167x167.png",
"settings": "unpackage/res/icons/29x29.png",
"settings@2x": "unpackage/res/icons/58x58.png",
"spotlight": "unpackage/res/icons/40x40.png",
"spotlight@2x": "unpackage/res/icons/80x80.png"
},
"iphone" : {
"app@2x" : "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png"
"iphone": {
"app@2x": "unpackage/res/icons/120x120.png",
"app@3x": "unpackage/res/icons/180x180.png",
"notification@2x": "unpackage/res/icons/40x40.png",
"notification@3x": "unpackage/res/icons/60x60.png",
"settings@2x": "unpackage/res/icons/58x58.png",
"settings@3x": "unpackage/res/icons/87x87.png",
"spotlight@2x": "unpackage/res/icons/80x80.png",
"spotlight@3x": "unpackage/res/icons/120x120.png"
}
}
}
},
"nvueLaunchMode" : ""
"nvueLaunchMode": ""
},
/* 快应用特有相关 */
"quickapp" : {},
"quickapp": {},
/* 小程序特有相关 */
"mp-weixin" : {
"appid" : "wx060bcd34e30d0db2",
"setting" : {
"urlCheck" : false,
"postcss" : true,
"es6" : false,
"minified" : true
"mp-weixin": {
"appid": "wx060bcd34e30d0db2",
"setting": {
"urlCheck": false,
"postcss": true,
"es6": false,
"minified": true
},
"usingComponents" : true
"usingComponents": true
},
"mp-alipay" : {
"usingComponents" : true
"mp-alipay": {
"usingComponents": true
},
"mp-baidu" : {
"usingComponents" : true
"mp-baidu": {
"usingComponents": true
},
"mp-toutiao" : {
"usingComponents" : true
"mp-toutiao": {
"usingComponents": true
},
"uniStatistics" : {
"enable" : false
"uniStatistics": {
"enable": false
},
"vueVersion" : "2",
"quickapp-webview" : {
"icon" : "wms",
"package" : "com.liexin.wms",
"versionName" : "1.0",
"minPlatformVersion" : "1.0"
"vueVersion": "2",
"quickapp-webview": {
"icon": "wms",
"package": "com.liexin.wms",
"versionName": "1.0",
"minPlatformVersion": "1.0"
},
"fallbackLocale" : "zh-Hans",
"softinput" : {
"fallbackLocale": "zh-Hans",
"softinput": {
//可选,JSON对象,软键盘相关配置
"navBar" : "auto", //可选,字符串类型,iOS平台软键盘上导航条的显示模式,可取值auto、none
"auxiliary" : true, //可选,Boolean类型,是否开启辅助输入功能
"mode" : "adjustPan" //可选,字符串类型,弹出系统软键盘模式,可取值adjustResize、adjustPan
"navBar": "auto", //可选,字符串类型,iOS平台软键盘上导航条的显示模式,可取值auto、none
"auxiliary": true, //可选,Boolean类型,是否开启辅助输入功能
"mode": "adjustPan" //可选,字符串类型,弹出系统软键盘模式,可取值adjustResize、adjustPan
},
"locale" : "zh-Hans"
}
"locale": "zh-Hans"
}
\ No newline at end of file
......@@ -23,7 +23,7 @@
<input class="uni-input" placeholder="请输入FedEx" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.tracking_no" @input="handleInput(0, $event)" />
</template>
<template v-else-if="index == 3">
<input class="uni-input" maxlength="-1" placeholder="请输入DigKey" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.code_type" @input="handleInputChange($event)" style="width: 100%;" />
<input class="uni-input" maxlength="-1" placeholder="请输入DigiKey" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.code_type" @input="handleInputChange($event)" style="width: 100%;" />
</template>
<template v-else-if="index == 4">
<input class="uni-input" maxlength="-1" placeholder="请输入Rochester" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.code_type" @input="handleInputChange($event)" style="width: 100%;" />
......@@ -34,6 +34,9 @@
<template v-else-if="index == 6">
<input class="uni-input" maxlength="-1" placeholder="请输入Chip1stop" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.code_type" @input="handleInputChange($event)" style="width: 100%;" />
</template>
<template v-else-if="index == 7">
<input class="uni-input" maxlength="-1" placeholder="请输入Mouser" placeholder-style="color:#919399" :focus="is_focus" v-model="searchParams.code_type" @input="handleInputChange($event)" style="width: 100%;" />
</template>
</view>
<text class="iconfont icon-a-juxing11" @click="clearInput(1)" v-if="input_flag"></text>
</view>
......@@ -219,7 +222,7 @@
limit: 30, //分页限制数量
index: uni.getStorageSync('tallyReceiveIndex') || 0, //记录用户上一次的选择
indexContainer: -1,
array: ['全量搜索', '入仓号', 'FedEx', 'DigKey', 'Rochester'],
array: ['全量搜索', '入仓号', 'FedEx', 'DigiKey', 'Rochester', 'TME', 'Chip1stop', 'Mouser'],
list: [],
filter_list: [], //筛选已选中的列表
filter_id: [], //入库单列表的入库登记
......@@ -369,7 +372,7 @@
});
},
/**
* 清空数据 1(全量搜索,入仓号,FedEx,DigKey,Rochester,TME,Chip1stop)
* 清空数据 1(全量搜索,入仓号,FedEx,DigiKey,Rochester,TME,Chip1stop)
* @param {Object} type
*/
clearInput(type) {
......@@ -385,7 +388,7 @@
//清空FedEx
this.searchParams.tracking_no = '';
} else if (this.index == 3) {
//清空DigKey以及赋值的goods_name
//清空DigiKey以及赋值的goods_name
this.searchParams.code_type = '';
this.searchParams.goods_name = '';
} else if (this.index == 4) {
......@@ -400,6 +403,10 @@
//清空Chip1stop供应商以及赋值的goods_name
this.searchParams.code_type = '';
this.searchParams.goods_name = '';
} else if (this.index == 7) {
//清空Mouser供应商以及赋值的goods_name
this.searchParams.code_type = '';
this.searchParams.goods_name = '';
}
this.input_flag = false;
this.clearInputAndFocus(); //再次获取焦点
......@@ -424,7 +431,7 @@
this.resetChange(); //先清空数据
this.searchParams.stock_in_with_stock_in_items_inhouse = ''; //清空入仓号字段
this.searchParams.tracking_no = ''; //清空FedEx
this.searchParams.code_type = ''; //清空DigKey等一系列供应商
this.searchParams.code_type = ''; //清空DigiKey等一系列供应商
this.searchParams.mobile_wait_tally_all_search = val; //赋值全量搜索字段
this.input_flag = true;
......@@ -434,7 +441,7 @@
this.resetChange();
this.searchParams.mobile_wait_tally_all_search = ''; //清空全量搜索字段
this.searchParams.tracking_no = ''; //清空FedEx
this.searchParams.code_type = ''; //清空DigKey等一系列供应商
this.searchParams.code_type = ''; //清空DigiKey等一系列供应商
//处理F号开头
var str = val;
......@@ -456,7 +463,7 @@
this.resetChange();
this.searchParams.mobile_wait_tally_all_search = ''; //清空全量搜索字段
this.searchParams.stock_in_with_stock_in_items_inhouse = ''; //清空入仓号字段
this.searchParams.code_type = ''; //清空DigKey等一系列供应商
this.searchParams.code_type = ''; //清空DigiKey等一系列供应商
// 规则处理FedEx截取后12位
let last12 = val.slice(22);
this.searchParams.tracking_no = last12; //赋值FedEx
......@@ -478,7 +485,7 @@
}
}, 500),
/**
* DigKey,Rochester,TME,Chip1stop供应商
* DigiKey,Rochester,TME,Chip1stop供应商
* @param {Object} event
*
*/
......@@ -487,12 +494,13 @@
if (val) {
this.resetChange(); //先清空数据
this.resetSearchParams(); //重置参数
this.searchParams.code_type = val; //赋值DigKey,Rochester,TME,Chip1stop供应商
this.searchParams.code_type = val; //赋值DigiKey,Rochester,TME,Chip1stop供应商
let codeTypeByIndex = {
3: 'DigKey',
3: 'DigiKey',
4: 'Rochester',
5: 'TME',
6: 'Chip1stop'
6: 'Chip1stop',
7: 'Mouser'
};
const codeType = codeTypeByIndex[this.index] || '';
this.input_flag = true;
......@@ -518,25 +526,14 @@
/**
* 识别二维码的数量和型号
* @param {Object} code_str 输入值
* @param {Object} code_type 供应商类型(DigKey,Rochester,TME,Chip1stop
* @param {Object} code_type 供应商类型(DigiKey,Rochester,TME,Chip1stop,Mouser
*/
identifyQrCodeNumAndSn(code_str, code_type) {
// 找到第一个1P的位置
var index = code_str.indexOf('1P');
var result = '';
if (index !== -1) {
// 从第七位开始截取直到第一个1P的位置
result = code_str.substring(6, index);
} else {
uni.showToast({
title: '未识别到匹配的内容',
icon: 'none'
});
}
var device = uni.getDeviceInfo();
//匹配到内容才开始调接口
if (result && !this.isRequestSent) {
if (!this.isRequestSent) {
this.isRequestSent = true; // 设置标志,防止重复发送请求
this.request(API.identifyQrCodeNumAndSn, 'POST', { data: result, type: code_type }, true).then(res => {
this.request(API.identifyQrCodeNumAndSn, 'POST', { data: code_str, type: code_type, device: device.deviceModel }, true).then(res => {
this.isRequestSent = false; // 请求完成后重置标志
if (res.code === 0) {
this.searchParams.goods_name = res.data.model; //赋值检索出来的型号
......
// 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 = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment