扫码

manifest.json

@@ -41,9 +41,48 @@
                 ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "ad" : {}
+            }
+        },
+        "nativePlugins" : {
+            "Mpaas-Scan" : {
+                "AppId" : "ALIPUBE2DD724280911",
+                "License" : "tJsii2WmYoPlQ9dy07LPSgrDE8dK7sfZzDVgyiBVAPmsBMakYVRKoQy2rOcearXGgXWS35dtaTgxgu5zsM",
+                "WorkspaceId" : "default",
+                "__plugin_info__" : {
+                    "name" : "支付宝原生扫码插件",
+                    "description" : "支付宝原生扫码组件，包体积仅0.7MB，15分钟即可完成接入。同时，mPaaS提供「扫码分析」大盘",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=2636",
+                    "android_package_name" : "uni.UNI80C78D1",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "2636",
+                    "parameters" : {
+                        "AppId" : {
+                            "des" : "Android平台的AppId，请填写Android的config文件中的appId对应的值",
+                            "key" : "mobilegw.appid",
+                            "value" : ""
+                        },
+                        "License" : {
+                            "des" : "Android平台的License,，请填写Android的config文件中的mpaasConfigLicense对应的值",
+                            "key" : "mpaasConfigLicense",
+                            "value" : ""
+                        },
+                        "WorkspaceId" : {
+                            "des" : "Android平台的WorkspaceId，请填写Android的config文件中的workspaceId对应的值",
+                            "key" : "workspaceId",
+                            "value" : ""
+                        }
+                    }
+                }
+            }
         }
     },
     /* 快应用特有相关 */

pages/login/login.vue

@@ -181,6 +181,27 @@
 				return status;
 			}
 			// #endif
+			,
+			async checkMpaasScan () {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					// 扫码识别类型，参数可多选，qrCode、barCode，不设置，默认识别所有
+					'scanType':  ['qrCode','barCode'],
+					// 是否隐藏相册，默认false不隐藏
+					'hideAlbum': false
+				},
+				(ret) => {
+					uni.showModal({
+						title: "弹窗标题",
+						// 返回值中，resp_code 表示返回结果值，10：用户取消，11：其他错误，1000：成功
+						// 返回值中，resp_message 表示返回结果信息
+						// 返回值中，resp_result 表示扫码结果，只有成功才会有返回
+						content: JSON.stringify(ret),
+						showCancel: false,
+						confirmText: "确定"
+					})
+				})
+			}
 		}
 	}
 </script>

pages/management/hcxcheck.vue

@@ -109,7 +109,7 @@
 				<view class="confirm-button-wrap">
 					<button class="confirm-button" :class="{'confirm-button_disabled': !val1 || !index3 || !val6 || !val7}" :disabled="disabled1" @tap="_setfullBox">设为满框</button>
 					<button class="confirm-button" :class="{'confirm-button_disabled': !val1}" :disabled="disabled2" @tap="_setEmptyBox">设为空框</button>
-					<button class="confirm-button" :class="{'confirm-button_disabled': !val1}" :disabled="disabled3" @tap="_deleteBox">设为空位</button>
+					<button class="confirm-button" :class="{'confirm-button_disabled': !val1}" :disabled="disabled3" @tap="_deleteBox">删除</button>
 				</view>
 			</view>
 		</view>
@@ -247,12 +247,11 @@
 				return
 			  }
 			  try {
+				this.$set(this.obj, 'position_code', this.obj.position_code)
 				this.$set(this.obj, 'vehicle_code', this.val1)
-				this.$set(this.obj, 'workprocedure_code', this.index3)
-				this.$set(this.obj, 'material_code', this.val2)
-				this.$set(this.obj, 'material_name', this.val3)
-				this.$set(this.obj, 'material_spec', this.val4)
 				this.$set(this.obj, 'material_id', this.val5)
+				this.$set(this.obj, 'workprocedure_code', this.index3)
+				this.$set(this.obj, 'wcsdevice_code', this.obj.wcsdevice_code)	
 				this.$set(this.obj, 'quantity', this.val6)
 				this.$set(this.obj, 'weight', this.val7)
 				let res = await setfullBox(this.obj) 
@@ -275,7 +274,7 @@
 			  try {
 				let obj = {}
 				this.$set(obj, 'vehicle_code', this.val1)
-				this.$set(obj, 'workprocedure_code', this.index3)
+				this.$set(obj, 'position_code', this.obj.position_code)
 				let res = await setEmptyBox(obj) 
 				this.disabled2 = false
 				this.toSearch()

vuex/types.js

@@ -6,4 +6,5 @@ export const DEL_LOGIN_NAME = 'DEL_LOGIN_NAME'
 export const COM_CONFIG = 'COM_CONFIG'
 export const SAVE_USER_INFO = 'SAVE_USER_INFO'
 export const DEL_USER_INFO = 'DEL_USER_INFO'
-export const PUBLIC_OBJ = 'PUBLIC_OBJ'
+export const PUBLIC_OBJ = 'PUBLIC_OBJ'
+export const SAVE_TOKEN = 'SAVE_TOKEN'