Commit 4f843677 by LJM

打印优化

parent e12942db
{ {
"name": "wms", "name" : "wms",
"appid": "__UNI__655E80D", "appid" : "__UNI__655E80D",
"description": "供应链仓储App", "description" : "供应链仓储App",
"versionName": "2.3.5", "versionName" : "2.3.6",
"versionCode": 100000000, "versionCode" : 100000000,
"transformPx": false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus": { "app-plus" : {
"usingComponents": true, "usingComponents" : true,
"nvueStyleCompiler": "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion": 3, "compilerVersion" : 3,
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": true, "alwaysShowBeforeRender" : true,
"waiting": true, "waiting" : true,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
/* 模块配置 */ /* 模块配置 */
"modules": { "modules" : {
"Camera": {}, "Camera" : {},
"Barcode": {}, "Barcode" : {},
"Bluetooth": {} "Bluetooth" : {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute": { "distribute" : {
/* android打包配置 */ /* android打包配置 */
"android": { "android" : {
"permissions": [ "permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
...@@ -45,86 +45,86 @@ ...@@ -45,86 +45,86 @@
] ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios": { "ios" : {
"dSYMs": false "dSYMs" : false
}, },
/* SDK配置 */ /* SDK配置 */
"sdkConfigs": { "sdkConfigs" : {
"ad": {} "ad" : {}
}, },
"icons": { "icons" : {
"android": { "android" : {
"hdpi": "unpackage/res/icons/72x72.png", "hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi": "unpackage/res/icons/96x96.png", "xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi": "unpackage/res/icons/144x144.png", "xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi": "unpackage/res/icons/192x192.png" "xxxhdpi" : "unpackage/res/icons/192x192.png"
}, },
"ios": { "ios" : {
"appstore": "unpackage/res/icons/1024x1024.png", "appstore" : "unpackage/res/icons/1024x1024.png",
"ipad": { "ipad" : {
"app": "unpackage/res/icons/76x76.png", "app" : "unpackage/res/icons/76x76.png",
"app@2x": "unpackage/res/icons/152x152.png", "app@2x" : "unpackage/res/icons/152x152.png",
"notification": "unpackage/res/icons/20x20.png", "notification" : "unpackage/res/icons/20x20.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x": "unpackage/res/icons/167x167.png", "proapp@2x" : "unpackage/res/icons/167x167.png",
"settings": "unpackage/res/icons/29x29.png", "settings" : "unpackage/res/icons/29x29.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight": "unpackage/res/icons/40x40.png", "spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x": "unpackage/res/icons/80x80.png" "spotlight@2x" : "unpackage/res/icons/80x80.png"
}, },
"iphone": { "iphone" : {
"app@2x": "unpackage/res/icons/120x120.png", "app@2x" : "unpackage/res/icons/120x120.png",
"app@3x": "unpackage/res/icons/180x180.png", "app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x": "unpackage/res/icons/60x60.png", "notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x": "unpackage/res/icons/87x87.png", "settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x": "unpackage/res/icons/80x80.png", "spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x": "unpackage/res/icons/120x120.png" "spotlight@3x" : "unpackage/res/icons/120x120.png"
} }
} }
} }
}, },
"nvueLaunchMode": "" "nvueLaunchMode" : ""
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp": {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin": { "mp-weixin" : {
"appid": "wx060bcd34e30d0db2", "appid" : "wx060bcd34e30d0db2",
"setting": { "setting" : {
"urlCheck": false, "urlCheck" : false,
"postcss": true, "postcss" : true,
"es6": false, "es6" : false,
"minified": true "minified" : true
}, },
"usingComponents": true "usingComponents" : true
}, },
"mp-alipay": { "mp-alipay" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-baidu": { "mp-baidu" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-toutiao": { "mp-toutiao" : {
"usingComponents": true "usingComponents" : true
}, },
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
}, },
"vueVersion": "2", "vueVersion" : "2",
"quickapp-webview": { "quickapp-webview" : {
"icon": "wms", "icon" : "wms",
"package": "com.liexin.wms", "package" : "com.liexin.wms",
"versionName": "1.0", "versionName" : "1.0",
"minPlatformVersion": "1.0" "minPlatformVersion" : "1.0"
}, },
"fallbackLocale": "zh-Hans", "fallbackLocale" : "zh-Hans",
"softinput": { "softinput" : {
//可选,JSON对象,软键盘相关配置 //可选,JSON对象,软键盘相关配置
"navBar": "auto", //可选,字符串类型,iOS平台软键盘上导航条的显示模式,可取值auto、none "navBar" : "auto", //可选,字符串类型,iOS平台软键盘上导航条的显示模式,可取值auto、none
"auxiliary": true, //可选,Boolean类型,是否开启辅助输入功能 "auxiliary" : true, //可选,Boolean类型,是否开启辅助输入功能
"mode": "adjustPan" //可选,字符串类型,弹出系统软键盘模式,可取值adjustResize、adjustPan "mode" : "adjustPan" //可选,字符串类型,弹出系统软键盘模式,可取值adjustResize、adjustPan
}, },
"locale": "zh-Hans" "locale" : "zh-Hans"
} }
\ No newline at end of file
...@@ -232,6 +232,7 @@ ...@@ -232,6 +232,7 @@
hasMoreData: true, //是否分页加载 hasMoreData: true, //是否分页加载
is_watch: false, //是否看货 is_watch: false, //是否看货
isRequestSent: false, isRequestSent: false,
isStopRequest: false,
searchParams: { searchParams: {
mobile_wait_tally_all_search: '', //全量搜索 mobile_wait_tally_all_search: '', //全量搜索
stock_in_with_stock_in_items_inhouse: '', //入仓单号 stock_in_with_stock_in_items_inhouse: '', //入仓单号
...@@ -529,6 +530,7 @@ ...@@ -529,6 +530,7 @@
* @param {Object} code_type 供应商类型(DigiKey,Rochester,TME,Chip1stop,Mouser) * @param {Object} code_type 供应商类型(DigiKey,Rochester,TME,Chip1stop,Mouser)
*/ */
identifyQrCodeNumAndSn(code_str, code_type) { identifyQrCodeNumAndSn(code_str, code_type) {
var self = this;
var device = uni.getDeviceInfo(); var device = uni.getDeviceInfo();
//匹配到内容才开始调接口 //匹配到内容才开始调接口
if (!this.isRequestSent) { if (!this.isRequestSent) {
...@@ -536,10 +538,24 @@ ...@@ -536,10 +538,24 @@
this.request(API.identifyQrCodeNumAndSn, 'POST', { data: code_str, type: code_type, device: device.deviceModel }, true).then(res => { this.request(API.identifyQrCodeNumAndSn, 'POST', { data: code_str, type: code_type, device: device.deviceModel }, true).then(res => {
this.isRequestSent = false; // 请求完成后重置标志 this.isRequestSent = false; // 请求完成后重置标志
if (res.code === 0) { if (res.code === 0) {
//如果后台搜索到型号则替换输入框的值
if (res.data.model) {
this.searchParams.code_type = res.data.model;
}
this.searchParams.goods_name = res.data.model; //赋值检索出来的型号 this.searchParams.goods_name = res.data.model; //赋值检索出来的型号
this.resetChange(); //清空数据 this.resetChange(); //清空数据
setTimeout(() => { setTimeout(() => {
this.getData(); this.getData((data) => {
//TME 特殊处理
if (code_type == 'TME') {
//条件:后台搜索不到数据,则拿model2字段继续请求 只请求一次
if (data.length == 0 && res.data.model2 && !this.isStopRequest) {
this.isStopRequest = true;
this.searchParams.goods_name = res.data.model2;
self.getData(); //识别二维码的数量和型号
}
}
});
}, 0) }, 0)
} else { } else {
uni.showToast({ uni.showToast({
...@@ -610,7 +626,7 @@ ...@@ -610,7 +626,7 @@
/** /**
* 获取列表数据 支持分页 * 获取列表数据 支持分页
*/ */
getData() { getData(callback) {
this.request(API.waitTallyReceiveList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => { this.request(API.waitTallyReceiveList, 'POST', { page: this.page, limit: this.limit, ...this.searchParams }, false).then(res => {
if (res.code === 0) { if (res.code === 0) {
if (res.data.total > 0) { if (res.data.total > 0) {
...@@ -620,6 +636,7 @@ ...@@ -620,6 +636,7 @@
} else { } else {
this.hasMoreData = false; this.hasMoreData = false;
} }
typeof callback == 'function' && callback(res.data.list);
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
......
const API_BASE_USER = 'http://user.liexindev.net'; //用户系统 // const API_BASE_USER = 'http://user.liexindev.net'; //用户系统
const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统 // const API_BASE_PUR = 'http://pur.liexindev.net'; //采购系统
const API_BASE = 'http://wms.liexindev.net'; //WMS系统 // const API_BASE = 'http://wms.liexindev.net'; //WMS系统
const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统 // const API_BASE_OSS = 'http://image.liexindev.net'; //oss系统
// const API_BASE_USER = 'https://user.ichunt.net'; //用户系统 const API_BASE_USER = 'https://user.ichunt.net'; //用户系统
// const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统 const API_BASE_PUR = 'https://purchase.ichunt.net'; //采购系统
// const API_BASE = 'https://wms.ichunt.net'; //WMS系统 const API_BASE = 'https://wms.ichunt.net'; //WMS系统
// const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统 const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
const API = { 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