From 2f26ba8f2c8f5c67e5ed16f4e89baaef82d70a3b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 30 五月 2025 13:29:49 +0800
Subject: [PATCH] 联调pda扫码功能，解决pda上面样式问题
---
static/custom/home/ten.png | 0
pages/product/feed/locationList.vue | 267 ++++++++--------
static/custom/home/eleven.png | 0
pages/sys/home/index.vue | 36 +
static/custom/home/three.png | 0
static/custom/home/twelve.png | 0
static/custom/home/four.png | 0
static/custom/home/seven.png | 0
static/custom/home/eight.png | 0
static/custom/home/one.png | 0
static/custom/home/six.png | 0
manifest.json | 371 +++++++++++-----------
static/custom/home/five.png | 0
pages/product/report/index.vue | 28 +
components/scan/scan.vue | 218 +++++++++----
static/custom/home/nine.png | 0
static/custom/home/two.png | 0
pages/sys/user/index.vue | 2
18 files changed, 517 insertions(+), 405 deletions(-)
diff --git a/components/scan/scan.vue b/components/scan/scan.vue
index c39741c..7940f65 100644
--- a/components/scan/scan.vue
+++ b/components/scan/scan.vue
@@ -1,93 +1,167 @@
<template>
<view>
<view class="content">
+ <!-- <text>鎵弿缁撴灉锛歿{ scanResult }}</text> -->
</view>
</view>
</template>
<script>
- var main, receiver, filter;
- var action, extraKey;
- var _codeQueryTag = false;
- export default {
- data() {
- return {
- scanCode: ''
- }
- },
- created: function(option) {
- uni.getSystemInfo({
- success: (res) => {
- var brand = res.brand.toUpperCase();
- var model = res.model.toUpperCase();
- if (brand.indexOf("ZEBRA")!=-1 && model.indexOf("TC2")!=-1) {
- action = "com.zebra.scan";
- extraKey = "com.motorolasolutions.emdk.datawedge.data_string";
- } else if (brand.indexOf("SEUIC")!=-1||brand.indexOf("AUTOID")!=-1) {
- action = "com.android.server.scannerservice.broadcast";
- extraKey = "scannerdata";
- }else{
- return;
- }
- console.log(action);
- console.log(extraKey);
- this.initScan()
- this.startScan();
+var main, receiver, filter;
+var action, extraKey;
+var _codeQueryTag = false;
+
+export default {
+ data() {
+ return {
+ scanCode: '',
+ scanResult: ''
+ }
+ },
+ created() {
+ uni.getSystemInfo({
+ success: (res) => {
+ var brand = res.brand.toUpperCase();
+ var model = res.model.toUpperCase();
+
+ console.log('璁惧鍝佺墝:', brand);
+ console.log('璁惧鍨嬪彿:', model);
+
+ // Zebra璁惧閰嶇疆
+ if (brand.indexOf("ZEBRA") != -1 && model.indexOf("TC2") != -1) {
+ action = "com.zebra.scan";
+ extraKey = "com.motorolasolutions.emdk.datawedge.data_string";
}
- })
+ // AUTOID9N璁惧閰嶇疆
+ else if (brand.indexOf("SEUIC") != -1 || brand.indexOf("AUTOID") != -1) {
+ // AUTOID9N涓撶敤閰嶇疆
+ if (model.indexOf("AUTOID9N") != -1) {
+ action = "com.android.server.scannerservice.broadcast";
+ extraKey = "scannerdata"; // 鎴� "BARCODE_STRING"锛屾牴鎹疄闄呮儏鍐佃皟鏁�
+ }
+ // 鍏朵粬SEUIC璁惧
+ else {
+ action = "com.android.server.scannerservice.broadcast";
+ extraKey = "scannerdata";
+ }
+ }
+ else {
+ console.log('鏈煡璁惧鍝佺墝锛屾棤娉曞垵濮嬪寲鎵爜');
+ return;
+ }
+ console.log('鎵爜骞挎挱閰嶇疆:', { action, extraKey });
+ this.initScan();
+ this.startScan();
+ },
+ fail: (err) => {
+ console.error('鑾峰彇绯荤粺淇℃伅澶辫触:', err);
+ }
+ });
+ },
+ onLoad() {
+ // 鐩戝惉鍏ㄥ眬鎵爜浜嬩欢
+ uni.$on('scan', (event) => {
+ this.scanResult = event.code;
+ console.log('鎵爜缁撴灉:', this.scanResult);
+ });
+ },
+ onUnload() {
+ this.stopScan();
+ uni.$off('scan'); // 绉婚櫎浜嬩欢鐩戝惉
+ },
+ methods: {
+ initScan() {
+ console.log('鍒濆鍖栨壂鐮佹帴鏀跺櫒');
-
- },
- onHide: function() {
- this.stopScan();
- },
- destroyed: function() {
- this.stopScan();
- },
- methods: {
- initScan() {
- console.log('initScan');
- let _this = this;
- main = plus.android.runtimeMainActivity(); //鑾峰彇activity
+ try {
+ main = plus.android.runtimeMainActivity(); // 鑾峰彇activity
var IntentFilter = plus.android.importClass('android.content.IntentFilter');
filter = new IntentFilter();
- //涓嬮潰鐨刟ddAction鍐呮敼涓鸿嚜宸辩殑骞挎挱鍔ㄤ綔
filter.addAction(action);
+
+ console.log('娉ㄥ唽骞挎挱杩囨护鍣�:', action);
+
receiver = plus.android.implements('io.dcloud.feature.internal.reflect.BroadcastReceiver', {
- onReceive: function(context, intent) {
- console.log('onReceive');
- plus.android.importClass(intent);
- //涓嬮潰鐨刧etStringExtra鍐呮敼涓鸿嚜宸辩殑骞挎挱鏍囩--鏈夎
- let code = intent.getStringExtra(extraKey);
- _this.queryCode(code);
- }
+ onReceive: function (context, intent) {
+ console.log('鎺ユ敹鍒版壂鐮佸箍鎾�');
+
+ try {
+ plus.android.importClass(intent);
+ let code = intent.getStringExtra(extraKey);
+
+ if (code) {
+ console.log('鎵爜鍐呭:', code);
+ this.queryCode(code);
+ } else {
+ console.warn('鎵爜鍐呭涓虹┖锛屽彲鑳紼xtraKey涓嶆纭�:', extraKey);
+
+ // 灏濊瘯澶囬�塃xtraKey
+ const altExtraKey = extraKey === "BARCODE_STRING" ? "scannerdata" : "BARCODE_STRING";
+ code = intent.getStringExtra(altExtraKey);
+
+ if (code) {
+ console.log('浣跨敤澶囬�塃xtraKey鑾峰彇鍒板唴瀹�:', altExtraKey);
+ this.queryCode(code);
+ }
+ }
+ } catch (e) {
+ console.error('澶勭悊鎵爜骞挎挱鏃跺嚭閿�:', e);
+ }
+ }.bind(this) // 纭繚this鎸囧悜缁勪欢瀹炰緥
});
- },
- startScan() {
- console.log('startScan');
- main.registerReceiver(receiver, filter);
- },
- stopScan() {
- console.log('stopScan');
- main.unregisterReceiver(receiver);
- },
- queryCode: function(code) {
- console.log('queryCode');
- if (_codeQueryTag) return false;
- _codeQueryTag = true;
- setTimeout(function() {
- _codeQueryTag = false;
- }, 150);
- var id = code
- uni.$emit('scan', {
- code: id
- })
+
+ console.log('鎵爜鎺ユ敹鍣ㄥ垵濮嬪寲鎴愬姛');
+ } catch (e) {
+ console.error('鍒濆鍖栨壂鐮佹帴鏀跺櫒澶辫触:', e);
}
+ },
+ startScan() {
+ console.log('寮�濮嬬洃鍚壂鐮佸箍鎾�');
+
+ try {
+ if (main && receiver && filter) {
+ main.registerReceiver(receiver, filter);
+ console.log('骞挎挱鎺ユ敹鍣ㄥ凡娉ㄥ唽');
+ } else {
+ console.error('鏃犳硶娉ㄥ唽骞挎挱鎺ユ敹鍣�: 缁勪欢鏈垵濮嬪寲');
+ }
+ } catch (e) {
+ console.error('娉ㄥ唽骞挎挱鎺ユ敹鍣ㄥけ璐�:', e);
+ }
+ },
+ stopScan() {
+ console.log('鍋滄鐩戝惉鎵爜骞挎挱');
+
+ try {
+ if (main && receiver) {
+ main.unregisterReceiver(receiver);
+ console.log('骞挎挱鎺ユ敹鍣ㄥ凡娉ㄩ攢');
+ }
+ } catch (e) {
+ console.error('娉ㄩ攢骞挎挱鎺ユ敹鍣ㄥけ璐�:', e);
+ }
+ },
+ queryCode(code) {
+ console.log('澶勭悊鎵爜缁撴灉:', code);
+
+ if (_codeQueryTag) {
+ console.log('蹇界暐閲嶅鎵爜');
+ return false;
+ }
+
+ _codeQueryTag = true;
+
+ // 闃叉姈澶勭悊
+ setTimeout(() => {
+ _codeQueryTag = false;
+ }, 150);
+
+ // 瑙﹀彂鍏ㄥ眬浜嬩欢
+ uni.$emit('scan', { code });
}
}
+}
</script>
-<style>
-
-</style>
+<style></style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 1a453f9..34f0249 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,192 +1,195 @@
{
- "name" : "姹熶笢鍚堥噾MES",
- "appid" : "__UNI__2E031D3",
- "description" : "pigcloud",
- "versionName" : "4.0.2",
- "versionCode" : 2,
- "transformPx" : false,
- "app-plus" : {
- "compilerVersion" : 3,
- "optimization" : {
- "subPackages" : true
+ "name": "姹熶笢鍚堥噾MES",
+ "appid": "__UNI__2E031D3",
+ "description": "pigcloud",
+ "versionName": "4.0.2",
+ "versionCode": 2,
+ "transformPx": false,
+ "app-plus": {
+ "compilerVersion": 3,
+ "optimization": {
+ "subPackages": true
+ },
+ "safearea": {
+ "bottom": {
+ "offset": "none"
+ }
+ },
+ "splashscreen": {
+ "alwaysShowBeforeRender": true,
+ "waiting": true,
+ "autoclose": true,
+ "delay": 0
+ },
+ "compatible": {
+ "ignoreVersion": true
+ },
+ "usingComponents": true,
+ "nvueCompiler": "uni-app",
+ "modules": {
+ "Bluetooth": {}
+ },
+ "distribute": {
+ "android": {
+ "permissions": [
+ "<uses-feature android:name=\"android.hardware.camera\"/>",
+ "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+ "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+ "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+ "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+ "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+ "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+ "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+ "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+ "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+ "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+ "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+ "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
+ "<uses-permission android:name=\"android.permission.BLUETOOTH_CONNECT\"/> ",
+ "<uses-permission android:name=\"android.permission.BLUETOOTH_SCAN\"/>",
+ "<uses-permission android:name=\"android.permission.RECEIVE_SMS\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+ "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>"
+ ],
+ "abiFilters": ["armeabi-v7a", "arm64-v8a"]
+ },
+ "ios": {
+ "dSYMs": false
+ },
+ "sdkConfigs": {
+ "ad": {},
+ "oauth": {}
+ },
+ "icons": {
+ "android": {
+ "hdpi": "C:/Users/MLL/Desktop/03ae6e42ca681ffd98737b6a20f94d0.png",
+ "xhdpi": "C:/Users/MLL/Desktop/03ae6e42ca681ffd98737b6a20f94d0.png",
+ "xxhdpi": "C:/Users/MLL/Desktop/03ae6e42ca681ffd98737b6a20f94d0.png",
+ "xxxhdpi": "C:/Users/MLL/Desktop/03ae6e42ca681ffd98737b6a20f94d0.png"
},
- "safearea" : {
- "bottom" : {
- "offset" : "none"
- }
- },
- "splashscreen" : {
- "alwaysShowBeforeRender" : true,
- "waiting" : true,
- "autoclose" : true,
- "delay" : 0
- },
- "compatible" : {
- "ignoreVersion" : true
- },
- "usingComponents" : true,
- "nvueCompiler" : "uni-app",
- "modules" : {
- "Bluetooth" : {}
- },
- "distribute" : {
- "android" : {
- "permissions" : [
- "<uses-feature android:name=\"android.hardware.camera\"/>",
- "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
- "<uses-permission android:name=\"android.permission.CAMERA\"/>",
- "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
- "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
- "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
- "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
- "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
- "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
- "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
- "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
- "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
- "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
- "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
- "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
- "<uses-permission android:name=\"android.permission.BLUETOOTH_CONNECT\"/> ",
- "<uses-permission android:name=\"android.permission.BLUETOOTH_SCAN\"/>"
- ],
- "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
- },
- "ios" : {
- "dSYMs" : false
- },
- "sdkConfigs" : {
- "ad" : {},
- "oauth" : {}
- },
- "icons" : {
- "android" : {
- "hdpi" : "C:/Users/MLL/Desktop/03ae6e42ca681ffd98737b6a20f94d0.png",
- "xhdpi" : "C:/Users/MLL/Desktop/03ae6e42ca681ffd98737b6a20f94d0.png",
- "xxhdpi" : "C:/Users/MLL/Desktop/03ae6e42ca681ffd98737b6a20f94d0.png",
- "xxxhdpi" : "C:/Users/MLL/Desktop/03ae6e42ca681ffd98737b6a20f94d0.png"
- },
- "ios" : {
- "appstore" : "",
- "ipad" : {
- "app" : "",
- "app@2x" : "",
- "notification" : "",
- "notification@2x" : "",
- "proapp@2x" : "",
- "settings" : "",
- "settings@2x" : "",
- "spotlight" : "",
- "spotlight@2x" : ""
- },
- "iphone" : {
- "app@2x" : "",
- "app@3x" : "",
- "notification@2x" : "",
- "notification@3x" : "",
- "settings@2x" : "",
- "settings@3x" : "",
- "spotlight@2x" : "",
- "spotlight@3x" : ""
- }
- }
- },
- "splashscreen" : {
- "androidStyle" : "common"
- }
- },
- "nativePlugins" : {
- "JCSDK-JCApiModule" : {
- "__plugin_info__" : {
- "name" : "绮捐嚕鎵撳嵃鏈烘帴鍏ユ彃浠�",
- "description" : "绮捐嚕绯诲垪鎵撳嵃鏈烘墦鍗版彃浠�",
- "platforms" : "Android,iOS",
- "url" : "https://ext.dcloud.net.cn/plugin?id=10011",
- "android_package_name" : "uni.UNI2E031D3",
- "ios_bundle_id" : "",
- "isCloud" : true,
- "bought" : 1,
- "pid" : "10011",
- "parameters" : {}
- }
- }
+ "ios": {
+ "appstore": "",
+ "ipad": {
+ "app": "",
+ "app@2x": "",
+ "notification": "",
+ "notification@2x": "",
+ "proapp@2x": "",
+ "settings": "",
+ "settings@2x": "",
+ "spotlight": "",
+ "spotlight@2x": ""
+ },
+ "iphone": {
+ "app@2x": "",
+ "app@3x": "",
+ "notification@2x": "",
+ "notification@3x": "",
+ "settings@2x": "",
+ "settings@3x": "",
+ "spotlight@2x": "",
+ "spotlight@3x": ""
+ }
}
+ },
+ "splashscreen": {
+ "androidStyle": "common"
+ }
},
- "quickapp" : {},
- "mp-weixin" : {
- "appid" : "wxf3e5cc7116d23b18",
- "setting" : {
- "urlCheck" : false,
- "es6" : false,
- "minified" : true,
- "postcss" : true
+ "nativePlugins": {
+ "JCSDK-JCApiModule": {
+ "__plugin_info__": {
+ "name": "绮捐嚕鎵撳嵃鏈烘帴鍏ユ彃浠�",
+ "description": "绮捐嚕绯诲垪鎵撳嵃鏈烘墦鍗版彃浠�",
+ "platforms": "Android,iOS",
+ "url": "https://ext.dcloud.net.cn/plugin?id=10011",
+ "android_package_name": "uni.UNI2E031D3",
+ "ios_bundle_id": "",
+ "isCloud": true,
+ "bought": 1,
+ "pid": "10011",
+ "parameters": {}
+ }
+ }
+ }
+ },
+ "quickapp": {},
+ "mp-weixin": {
+ "appid": "wxf3e5cc7116d23b18",
+ "setting": {
+ "urlCheck": false,
+ "es6": false,
+ "minified": true,
+ "postcss": true
+ },
+ "optimization": {
+ "subPackages": true
+ },
+ "usingComponents": true
+ },
+ "mp-alipay": {
+ "usingComponents": true,
+ "component2": true
+ },
+ "mp-qq": {
+ "optimization": {
+ "subPackages": true
+ },
+ "appid": ""
+ },
+ "mp-baidu": {
+ "usingComponents": true,
+ "appid": ""
+ },
+ "mp-toutiao": {
+ "usingComponents": true,
+ "appid": ""
+ },
+ "h5": {
+ "template": "h5.html",
+ "router": {
+ "mode": "hash",
+ "base": "./"
+ },
+ "optimization": {
+ "treeShaking": {
+ "enable": false
+ }
+ },
+ "devServer": {
+ "port": 8080, //娴忚鍣ㄨ繍琛岀鍙�
+ "disableHostCheck": true,
+ "proxy": {
+ "/auth": {
+ "target": "http://192.168.32.65:9999",
+ "changeOrigin": true,
+ "secure": false
},
- "optimization" : {
- "subPackages" : true
+ "/mes": {
+ "target": "http://192.168.32.65:9999",
+ "changeOrigin": true,
+ "secure": false
},
- "usingComponents" : true
+ "/admin": {
+ "target": "http://192.168.32.65:9999",
+ "changeOrigin": true,
+ "secure": false
+ }
+ }
},
- "mp-alipay" : {
- "usingComponents" : true,
- "component2" : true
- },
- "mp-qq" : {
- "optimization" : {
- "subPackages" : true
- },
- "appid" : ""
- },
- "mp-baidu" : {
- "usingComponents" : true,
- "appid" : ""
- },
- "mp-toutiao" : {
- "usingComponents" : true,
- "appid" : ""
- },
- "h5" : {
- "template" : "h5.html",
- "router" : {
- "mode" : "hash",
- "base" : "./"
- },
- "optimization" : {
- "treeShaking" : {
- "enable" : false
- }
- },
- "devServer" : {
- "port" : 8080, //娴忚鍣ㄨ繍琛岀鍙�
- "disableHostCheck" : true,
- "proxy" : {
- "/auth" : {
- "target" : "http://192.168.32.65:9999",
- "changeOrigin" : true,
- "secure" : false
- },
- "/mes" : {
- "target" : "http://192.168.32.65:9999",
- "changeOrigin" : true,
- "secure" : false
- },
- "/admin" : {
- "target" : "http://192.168.32.65:9999",
- "changeOrigin" : true,
- "secure" : false
- }
- }
- },
- "title" : "Asun-Mes",
- "domain" : "/app"
- },
- "locale" : "zh-Hans",
- "fallbackLocale" : "zh-Hans"
+ "title": "Asun-Mes",
+ "domain": "/app"
+ },
+ "locale": "zh-Hans",
+ "fallbackLocale": "zh-Hans"
}
diff --git a/pages/product/feed/locationList.vue b/pages/product/feed/locationList.vue
index 3ca8fde..6d95475 100644
--- a/pages/product/feed/locationList.vue
+++ b/pages/product/feed/locationList.vue
@@ -4,9 +4,9 @@
<u-search v-model="keywords" placeholder="璇疯緭鍏ュ簱浣嶅悕绉�" @clear="search" @custom="search" @search="search">
</u-search>
</view>
- <scroll-view class="scroll-list" scroll-y="true" >
+ <scroll-view class="scroll-list" scroll-y="true">
<u-cell-group class="list" :border="false">
- <view v-if="locationList==0" class="nodata">
+ <view v-if="locationList == 0" class="nodata">
<view>鏈煡鍒版暟鎹�</view>
</view>
<view v-else class="content" v-for="(item, index) in locationList" :key="item.locNo" :index="index"
@@ -32,15 +32,15 @@
搴撲綅绫诲瀷:
</view>
<view class="_content">
- {{ getLocTypeName(item.locType)}}
+ {{ getLocTypeName(item.locType) }}
</view>
</view>
<view class="row-list">
<view class="_label">
搴撲綅鐘舵��:
</view>
- <view class="_content">
- {{getLocStatus(item.locStatus)}}
+ <view class="_content">
+ {{ getLocStatus(item.locStatus) }}
</view>
</view>
</view>
@@ -50,147 +50,148 @@
</view>
</template>
<script>
- import scan from "@/components/scan/scan.vue";
- export default {
- components: {
- scan
+import scan from "@/components/scan/scan.vue";
+export default {
+ components: {
+ scan
+ },
+ data() {
+ return {
+ originList: [],
+ locationList: [],
+ keywords: "",
+ dictType: "warehouse_type",
+ listLocType: []
+ };
+ },
+ onLoad(params) {
+
+ //鑾峰彇鏁� 搴撲綅鐘舵��
+ this.$u.api.dictData({
+ dictType: this.dictType
+ }).then(res => {
+ this.listLocType = res.data;
+
+ });
+
+ if (params && params.workstationNo !== "undefined") {
+ this.loadList(params.workstationNo);
+ }
+
+ },
+ onShow() {
+ let that = this
+ uni.$off('scan') // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
+ uni.$on('scan', function (data) {
+ console.log('onscan');
+ //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
+ console.log('鎵爜缁撴灉锛�', data.code);
+ that.search(data.code);
+ })
+ },
+ onNavigationBarButtonTap(e) {
+ uni.scanCode({
+ success: res => {
+ try {
+ const result = JSON.parse(res.result)
+
+ } catch (e) { }
+ }
+ });
+ },
+ methods: {
+ getLocTypeName(locType) {
+ let reDate = ""
+ let that = this
+ //鍒ゆ柇鏁扮粍涓槸鍚﹀瓨鍦�
+ let list = that.listLocType.filter(item => item.value == locType)
+ if (list.length > 0) {
+ reDate = list[0].label
+ }
+ return reDate
},
- data() {
- return {
- originList: [],
- locationList: [],
- keywords: "",
- dictType: "warehouse_type",
- listLocType: []
- };
- },
- onLoad(params) {
-
- //鑾峰彇鏁� 搴撲綅鐘舵��
- this.$u.api.dictData({
- dictType: this.dictType
- }).then(res => {
- this.listLocType = res.data;
-
- });
-
- if (params && params.workstationNo !== "undefined") {
- this.loadList(params.workstationNo);
+ getLocStatus(locStatus) {
+ let reDate = ""
+ switch (locStatus) {
+ case 1:
+ reDate = "浣跨敤";
+ break;
+ case 0:
+ reDate = "鍋滅敤";
+ break;
}
+ return reDate;
},
- onShow() {
+ selectLocation(location) {
+ this.refreshLastPage(location)
+ },
+ //鍒锋柊涓婁竴涓〉闈�
+ refreshLastPage(location) {
+ // 鍛婄煡 A.vue 鏇存柊鏁版嵁
+ // 鑾峰彇椤甸潰鏍�
+ let pages = getCurrentPages()
- let that = this
+ // 鑾峰彇涓婁竴椤垫爤
+ let prevPage = pages[pages.length - 2]
- uni.$off('scan') // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
- uni.$on('scan', function(data) {
- console.log('onscan');
- //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
- console.log('鎵爜缁撴灉锛�', data.code);
- that.search(data.code);
+ // 瑙﹀彂涓婁竴椤� upData 鍑芥暟(骞舵惡甯﹀弬鏁�)
+ prevPage.$vm.setLocation(location)
+
+ // 杩斿洖涓婁竴椤�
+ uni.navigateBack({
+ delta: 1
})
},
- onNavigationBarButtonTap(e) {
- uni.scanCode({
- success: res => {
- try {
- const result = JSON.parse(res.result)
-
- } catch (e) {}
- }
+ search(value) {
+ let that = this
+ if (value) {
+ that.locationList = that.originList.filter(item => item.locName.includes(value))
+ } else {
+ that.locationList = that.originList
+ }
+ },
+ loadList(workstationNo) {
+ let params = {
+ workstationNo: workstationNo
+ }
+ //鏍规嵁宸ヤ綔绔欑紪鍙疯幏鍙栬繘琛屼腑鐨勫伐鍗�&&瀵瑰簲鐨勭嚎杈逛粨
+ this.$u.api.pigxFeed.getBasicInfoForPdaFeedByWorkstationNo(params).then(res => {
+ this.originList = res.data.locationList
+ this.locationList = this.originList
});
},
- methods: {
- getLocTypeName(locType) {
- let reDate = ""
- let that = this
- //鍒ゆ柇鏁扮粍涓槸鍚﹀瓨鍦�
- let list = that.listLocType.filter(item => item.value == locType)
- if (list.length > 0) {
- reDate = list[0].label
- }
- return reDate
- },
- getLocStatus(locStatus) {
- let reDate = ""
- switch (locStatus) {
- case 1:
- reDate = "浣跨敤";
- break;
- case 0:
- reDate = "鍋滅敤";
- break;
- }
-
- return reDate;
- },
- selectLocation(location) {
- this.refreshLastPage(location)
- },
- //鍒锋柊涓婁竴涓〉闈�
- refreshLastPage(location) {
- // 鍛婄煡 A.vue 鏇存柊鏁版嵁
- // 鑾峰彇椤甸潰鏍�
- let pages = getCurrentPages()
-
- // 鑾峰彇涓婁竴椤垫爤
- let prevPage = pages[pages.length - 2]
-
- // 瑙﹀彂涓婁竴椤� upData 鍑芥暟(骞舵惡甯﹀弬鏁�)
- prevPage.$vm.setLocation(location)
-
- // 杩斿洖涓婁竴椤�
- uni.navigateBack({
- delta: 1
- })
- },
- search(value) {
- let that = this
- if (value) {
- that.locationList = that.originList.filter(item => item.locName.includes(value))
- } else {
- that.locationList = that.originList
- }
- },
- loadList(workstationNo) {
- let params = {
- workstationNo: workstationNo
- }
- //鏍规嵁宸ヤ綔绔欑紪鍙疯幏鍙栬繘琛屼腑鐨勫伐鍗�&&瀵瑰簲鐨勭嚎杈逛粨
- this.$u.api.pigxFeed.getBasicInfoForPdaFeedByWorkstationNo(params).then(res => {
- this.originList = res.data.locationList
- this.locationList = this.originList
- });
- },
- }
- };
+ }
+};
</script>
<style lang="scss">
- .list .content {
- font-size: 12px;
- background-color: #efefef;
- box-sizing: border-box;
- border-radius: 14rpx;
- margin: 8px;
- padding: 5px 10px;
- box-shadow: none;
- }
+.list .content {
+ font-size: 12px;
+ background-color: #efefef;
+ box-sizing: border-box;
+ border-radius: 14rpx;
+ margin: 8px;
+ padding: 5px 10px;
+ box-shadow: none;
+}
- .row-list {
- display: flex;
- flex-direction: row;
- }
+.row-list {
+ display: flex;
+ flex-direction: row;
+}
- .row-list ._label {
- flex: 0.8;
- color: #909399;
- }
+.row-list ._label {
+ flex: 0.8;
+ color: #909399;
+}
- .row-list ._content {
- flex: 1.5;
- text-align: right;
- }
-
- .nodata{width: 20%;margin: auto;}
+.row-list ._content {
+ flex: 1.5;
+ text-align: right;
+}
+
+.nodata {
+ width: 20%;
+ margin: auto;
+}
</style>
diff --git a/pages/product/report/index.vue b/pages/product/report/index.vue
index a31fa52..2702466 100644
--- a/pages/product/report/index.vue
+++ b/pages/product/report/index.vue
@@ -60,14 +60,16 @@
</u-field>
</modalBg>
<saveForm ref="saveForm" />
+ <scan></scan>
</div>
</template>
<script>
import modalBg from '@/components/modal/modal-bg.vue'
import saveForm from './components/saveForm.vue'
+import scan from "@/components/scan/scan.vue";
export default {
- components: { modalBg, saveForm },
+ components: { modalBg, saveForm, scan },
data() {
return {
checkboxList: [
@@ -173,6 +175,22 @@
onReady() {
this.$refs.uForm.setRules(this.rules);
},
+ onShow() {
+ let that = this
+ uni.$off('scan') // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
+ uni.$on('scan', function (data) {
+ console.log('onscan');
+ //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
+ console.log('椤甸潰鎵爜缁撴灉锛�', data.code);
+ if (data.code) {
+ let codeInfo = JSON.parse(data.code)
+ if (codeInfo.WorkNo) {
+ // 鎵弿鎶ュ伐鍗曚簩缁寸爜
+ that.saveForm(codeInfo);
+ }
+ }
+ })
+ },
methods: {
// 澶氶�夊鐞�
changeCheckbox(val) {
@@ -205,8 +223,16 @@
url: '/pages/product/report/orderList'
})
},
+ // 瀛樿鍗曞彿
setNo(val) {
this.form.value3 = val
+ },
+ // 鍥炴樉鎵爜鐨勪俊鎭�-鎶ュ伐鍗�
+ saveForm(val) {
+ let { WorkNo, ProcessName, ORDER_NO } = val
+ this.form.value1 = WorkNo
+ this.form.value2 = ProcessName
+ this.form.value3 = ORDER_NO
}
}
}
diff --git a/pages/sys/home/index.vue b/pages/sys/home/index.vue
index 8ef7d48..94aa260 100644
--- a/pages/sys/home/index.vue
+++ b/pages/sys/home/index.vue
@@ -11,7 +11,8 @@
<u-grid :border="false">
<u-grid-item v-for="(baseListItem, baseListIndex) in item.list" :key="baseListIndex"
@click="navTo(baseListItem.url)">
- <img :src="require(`@/static/custom/home/${baseListItem.icon}.png`)" alt="">
+ <view class="img" :style="`background: url(../../../static/custom/home/${baseListItem.icon}.png) no-repeat;`">
+ </view>
<text class="grid-text">{{ baseListItem.name }}</text>
</u-grid-item>
</u-grid>
@@ -29,27 +30,27 @@
{
name: '鎶ュ伐',
url: '/pages/product/report/index',
- icon: '鎶ュ伐'
+ icon: 'one'
},
{
name: '鍙栨秷鎶ュ伐',
url: '/pages/product/cancelReport/index',
- icon: '鍙栨秷鎶ュ伐'
+ icon: 'two'
},
{
name: '鎺ユ敹锛堥摐鏉嗭級',
url: '/',
- icon: '鎺ユ敹锛堥摐鏉嗭級'
+ icon: 'three'
},
{
name: '杞﹂棿璁㈠崟涓嬪彂',
url: '/',
- icon: '杞﹂棿璁㈠崟涓嬪彂'
+ icon: 'four'
},
{
name: '杞﹂棿鍙栨秷涓嬪彂',
url: '/',
- icon: '杞﹂棿鍙栨秷涓嬪彂'
+ icon: 'five'
},
]
},
@@ -59,27 +60,27 @@
{
name: '绉诲簱',
url: '/pages/wareHouse/moveWareHouse/index',
- icon: '绉诲簱'
+ icon: 'six'
},
{
name: '鐩樼偣鎶ュ憡鐩樼偣',
url: '/pages/wareHouse/inventory/index',
- icon: '鐩樼偣鎶ュ憡鐩樼偣'
+ icon: 'seven'
},
{
name: '鏍哥褰曞叆',
url: '/pages/wareHouse/packing/registration',
- icon: '鏍哥褰曞叆'
+ icon: 'eight'
},
{
name: '搴撳瓨浠剁洏鐐�',
url: '/pages/wareHouse/inventory/index',
- icon: '搴撳瓨浠剁洏鐐�'
+ icon: 'nine'
},
{
name: '瀵间綋澶囪揣鐩樼偣',
url: '/pages/wareHouse/inventory/index',
- icon: '瀵间綋澶囪揣鐩樼偣'
+ icon: 'ten'
},
]
},
@@ -89,12 +90,12 @@
{
name: '棰嗘枡',
url: '/pages/wareHouse/moveWareHouse/index',
- icon: '棰嗘枡'
+ icon: 'eleven'
},
{
name: '鍙栨秷棰嗘枡',
url: '/pages/wareHouse/inventory/index',
- icon: '鍙栨秷棰嗘枡'
+ icon: 'twelve'
},
]
}
@@ -116,7 +117,7 @@
</script>
<style lang="scss">
.wrap {
- height: calc(100vh - 200rpx);
+ height: 100%;
background: linear-gradient(to bottom, #e5f0ff, #f6f9ff);
overflow-y: auto;
}
@@ -140,4 +141,11 @@
.u-grid-item {
background: transparent !important;
}
+
+.img {
+ width: 96rpx;
+ height: 96rpx;
+ background-size: contain !important;
+ background-position: center !important;
+}
</style>
\ No newline at end of file
diff --git a/pages/sys/user/index.vue b/pages/sys/user/index.vue
index 8400653..8d6ca57 100644
--- a/pages/sys/user/index.vue
+++ b/pages/sys/user/index.vue
@@ -69,7 +69,7 @@
<style lang="scss" scoped>
.my {
- height: calc(100vh - 100rpx);
+ height: 100%;
background: linear-gradient(to bottom, #E5F0FF, #F6F9FF);
.my-head {
diff --git "a/static/custom/home/\346\240\270\347\243\205\345\275\225\345\205\245.png" b/static/custom/home/eight.png
similarity index 100%
rename from "static/custom/home/\346\240\270\347\243\205\345\275\225\345\205\245.png"
rename to static/custom/home/eight.png
Binary files differ
diff --git "a/static/custom/home/\351\242\206\346\226\231.png" b/static/custom/home/eleven.png
similarity index 100%
rename from "static/custom/home/\351\242\206\346\226\231.png"
rename to static/custom/home/eleven.png
Binary files differ
diff --git "a/static/custom/home/\350\275\246\351\227\264\345\217\226\346\266\210\344\270\213\345\217\221.png" b/static/custom/home/five.png
similarity index 100%
rename from "static/custom/home/\350\275\246\351\227\264\345\217\226\346\266\210\344\270\213\345\217\221.png"
rename to static/custom/home/five.png
Binary files differ
diff --git "a/static/custom/home/\350\275\246\351\227\264\350\256\242\345\215\225\344\270\213\345\217\221.png" b/static/custom/home/four.png
similarity index 100%
rename from "static/custom/home/\350\275\246\351\227\264\350\256\242\345\215\225\344\270\213\345\217\221.png"
rename to static/custom/home/four.png
Binary files differ
diff --git "a/static/custom/home/\345\272\223\345\255\230\344\273\266\347\233\230\347\202\271.png" b/static/custom/home/nine.png
similarity index 100%
rename from "static/custom/home/\345\272\223\345\255\230\344\273\266\347\233\230\347\202\271.png"
rename to static/custom/home/nine.png
Binary files differ
diff --git "a/static/custom/home/\346\212\245\345\267\245.png" b/static/custom/home/one.png
similarity index 100%
rename from "static/custom/home/\346\212\245\345\267\245.png"
rename to static/custom/home/one.png
Binary files differ
diff --git "a/static/custom/home/\347\233\230\347\202\271\346\212\245\345\221\212\347\233\230\347\202\271.png" b/static/custom/home/seven.png
similarity index 100%
rename from "static/custom/home/\347\233\230\347\202\271\346\212\245\345\221\212\347\233\230\347\202\271.png"
rename to static/custom/home/seven.png
Binary files differ
diff --git "a/static/custom/home/\347\247\273\345\272\223.png" b/static/custom/home/six.png
similarity index 100%
rename from "static/custom/home/\347\247\273\345\272\223.png"
rename to static/custom/home/six.png
Binary files differ
diff --git "a/static/custom/home/\345\257\274\344\275\223\345\244\207\350\264\247\347\233\230\347\202\271.png" b/static/custom/home/ten.png
similarity index 100%
rename from "static/custom/home/\345\257\274\344\275\223\345\244\207\350\264\247\347\233\230\347\202\271.png"
rename to static/custom/home/ten.png
Binary files differ
diff --git "a/static/custom/home/\346\216\245\346\224\266\357\274\210\351\223\234\346\235\206\357\274\211.png" b/static/custom/home/three.png
similarity index 100%
rename from "static/custom/home/\346\216\245\346\224\266\357\274\210\351\223\234\346\235\206\357\274\211.png"
rename to static/custom/home/three.png
Binary files differ
diff --git "a/static/custom/home/\345\217\226\346\266\210\351\242\206\346\226\231.png" b/static/custom/home/twelve.png
similarity index 100%
rename from "static/custom/home/\345\217\226\346\266\210\351\242\206\346\226\231.png"
rename to static/custom/home/twelve.png
Binary files differ
diff --git "a/static/custom/home/\345\217\226\346\266\210\346\212\245\345\267\245.png" b/static/custom/home/two.png
similarity index 100%
rename from "static/custom/home/\345\217\226\346\266\210\346\212\245\345\267\245.png"
rename to static/custom/home/two.png
Binary files differ
--
Gitblit v1.9.3