3.13代码提交

App.vue

@@ -1,6 +1,8 @@
 <script>
 	export default {
 		onLaunch: function() {
+			// app内禁止横屏
+			plus.screen.lockOrientation('portrait-primary')
 			console.log('App Launch')
 		},
 		onShow: function() {

apis/apis.js

@@ -48,6 +48,14 @@ const index = {
 			header
 		)
 	},
+	async singleNotice (data = {} , header = {}){
+		return await Http.get(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.index.singleNotice,
+			data,
+			header
+		)
+	},
 	async waitDo (data = {} , header = {}){
 		return await Http.get(
 			HttpConfig.basePath,
@@ -63,6 +71,14 @@ const index = {
 			data,
 			header
 		)
+	},
+	async getUserInfo (data = {} , header = {}){
+		return await Http.get(
+			HttpConfig.systemPath,
+			HttpConfig.serviceUrl.index.getUserInfo,
+			data,
+			header
+		)
 	}
 }
 
@@ -158,6 +174,38 @@ const fetchExam = {
 			header
 		)
 	},
+	async rejectExam (data = {} , header = {}){
+		return await Http.post(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.fetchExam.rejectExam,
+			data,
+			header
+		)
+	},
+	async fetchExamListAll (data = {} , header = {}){
+		return await Http.get(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.fetchExam.fetchExamListAll,
+			data,
+			header
+		)
+	},
+	async fetchTrueExamList (data = {} , header = {}){
+		return await Http.get(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.fetchExam.fetchTrueExamList,
+			data,
+			header
+		)
+	},
+	async fetchDetailList (data = {} , header = {}){
+		return await Http.get(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.fetchExam.fetchDetailList,
+			data,
+			header
+		)
+	},
 }
 
 const newInStore = {
@@ -204,12 +252,34 @@ const fetchMaterialOutStore = {
 			header
 		)
 	},
+	async subOutStoreArr (data = {} , header = {}){
+		return await Http.post(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.fetchMaterialOutStore.subOutStoreArr,
+			data,
+			header
+		)
+	},
 	async fetchInfoByQrCode(data = {}){
 		return await Http.get(
 			HttpConfig.basePath,
 			HttpConfig.serviceUrl.fetchMaterialOutStore.fetchInfoByQrCode,
 			data
 		)
+	},
+	async fetchSingleDetail(data = {}){
+		return await Http.get(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.fetchMaterialOutStore.fetchSingleDetail,
+			data
+		)
+	},
+	async searchRfid(data = {}){
+		return await Http.post(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.fetchMaterialOutStore.searchRfid,
+			data
+		)
 	}
 }
 
@@ -305,6 +375,14 @@ const exitExam = {
 			header
 		)
 	},
+	async rejectExitExam (data = {} , header = {}){
+		return await Http.post(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.exitExam.rejectExitExam,
+			data,
+			header
+		)
+	},
 }
 
 const fix = {
@@ -372,6 +450,14 @@ const fix = {
 			header
 		)
 	},
+	async uploadPic (data = {} , header = {}){
+		return await Http.upload(
+			HttpConfig.systemPath,
+			HttpConfig.serviceUrl.fix.uploadPic,
+			data,
+			header
+		)
+	},
 }
 
 const repairTestInStore = {
@@ -459,18 +545,37 @@ const backMaterialReceive = {
 			header
 		)
 	},
- 
+	async seeBackMaterialDetail (data = {}, header = {}){
- 
+		return await Http.post(
- 
+			HttpConfig.basePath,
-	
+			HttpConfig.serviceUrl.backMaterialReceive.seeBackMaterialDetail,
-	
+			data,
+			header
+		)
+	},
+	async searchRfid (data = {}, header = {}){
+		return await Http.post(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.backMaterialReceive.searchRfid,
+			data,
+			header
+		)
+	},
+	async subRfid (data = {}, header = {}){
+		return await Http.post(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.backMaterialReceive.subRfid,
+			data,
+			header
+		)
+	},
 	// fetchMaterialOutStore
 }
 
 const crashExam = {
 	async crashExamList(data = {}, header = {}) {
 		return await Http.get(
-			HttpConfig.basePath,
+			HttpConfig.materialPath,
 			HttpConfig.serviceUrl.crashExam.crashExamList,
 			data,
 			header
@@ -478,7 +583,7 @@ const crashExam = {
 	},
 	async crashExamDetails(data = {}, header = {}) {
 		return await Http.get(
-			HttpConfig.basePath,
+			HttpConfig.materialPath,
 			HttpConfig.serviceUrl.crashExam.crashExamDetails,
 			data,
 			header
@@ -486,7 +591,7 @@ const crashExam = {
 	},
 	async crashExamAudit(data = {}, header = {}) {
 		return await Http.post(
-			HttpConfig.basePath,
+			HttpConfig.materialPath,
 			HttpConfig.serviceUrl.crashExam.crashExamAudit,
 			data,
 			header
@@ -495,26 +600,143 @@ const crashExam = {
 }
 
 const testExam = {
-	async crashExamList(data = {}, header = {}) {
+	async testExamList(data = {}, header = {}) {
 		return await Http.get(
-			HttpConfig.basePath,
+			HttpConfig.materialPath,
-			HttpConfig.serviceUrl.testExam.crashExamList,
+			HttpConfig.serviceUrl.testExam.testExamList,
 			data,
 			header
 		)
 	},
-	async crashExamDetails(data = {}, header = {}) {
+	async testExamDetails(data = {}, header = {}) {
 		return await Http.get(
-			HttpConfig.basePath,
+			HttpConfig.materialPath,
-			HttpConfig.serviceUrl.testExam.crashExamDetails,
+			HttpConfig.serviceUrl.testExam.testExamDetails,
 			data,
 			header
 		)
 	},
-	async crashExamAudit(data = {}, header = {}) {
+	async testExamAudit(data = {}, header = {}) {
+		return await Http.post(
+			HttpConfig.materialPath,
+			HttpConfig.serviceUrl.testExam.testExamAudit,
+			data,
+			header
+		)
+	},
+}
+
+const authManage = {
+	async fetchAuthList(data = {}, header = {}) {
+		return await Http.get(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.authManage.fetchAuthList,
+			data,
+			header
+		)
+	},
+	async fetchIsUsing(data = {}, header = {}) {
+		return await Http.get(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.authManage.fetchIsUsing,
+			data,
+			header
+		)
+	},
+	async subAdd(data = {}, header = {}) {
 		return await Http.post(
 			HttpConfig.basePath,
-			HttpConfig.serviceUrl.testExam.crashExamAudit,
+			HttpConfig.serviceUrl.authManage.subAdd,
+			data,
+			header
+		)
+	},
+	async subDel(data = {}, header = {}) {
+		return await Http.delete(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.authManage.subDel,
+			data,
+			header
+		)
+	},
+}
+
+const searchProjUsing = {
+	async fetchProjUsingList(data = {}, header = {}) {
+		return await Http.post(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.searchProjUsing.fetchProjUsingList,
+			data,
+			header
+		)
+	},
+}
+
+const searchFetchRecord = {
+	async fetchRecordList(data = {}, header = {}) {
+		return await Http.post(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.searchFetchRecord.fetchRecordList,
+			data,
+			header
+		)
+	},
+}
+
+const update = {
+	async fetchAppVer(data = {}, header = {}) {
+		return await Http.get(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.update.fetchAppVer,
+			data,
+			header
+		)
+	},
+}
+
+const rfidBinding = {
+	async bindRfid(data = {}, header = {}) {
+		return await Http.post(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.rfidBinding.bindRfid,
+			data,
+			header
+		)
+	},
+}
+
+const qrcodeBinding = {
+	async bindQrcode(data = {}, header = {}) {
+		return await Http.post(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.qrcodeBinding.bindQrcode,
+			data,
+			header
+		)
+	},
+	async fetchDeviceType(data = {}, header = {}) {
+		return await Http.get(
+			HttpConfig.materialPath,
+			HttpConfig.serviceUrl.qrcodeBinding.fetchDeviceType,
+			data,
+			header
+		)
+	},
+	async fetchDeviceSpec(data = {}, header = {}) {
+		return await Http.get(
+			HttpConfig.materialPath,
+			HttpConfig.serviceUrl.qrcodeBinding.fetchDeviceSpec,
+			data,
+			header
+		)
+	},
+}
+
+const indexScan = {
+	async infoByCode(data = {}, header = {}) {
+		return await Http.get(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.indexScan.infoByCode,
 			data,
 			header
 		)
@@ -535,5 +757,12 @@ export default{
 	repairTestInStore,
 	backMaterialReceive,
 	crashExam,
-	testExam
+	testExam,
+	authManage,
+	searchProjUsing,
+	searchFetchRecord,
+	update,
+	rfidBinding,
+	qrcodeBinding,
+	indexScan
 }

apis/http.js

@@ -4,42 +4,34 @@ class HttpConfig {
 	// #endif
 	// #ifdef APP-PLUS
 	// baseUrl = "http://112.29.103.165:21624"
-	// baseUrl = "http://10.40.92.219:8080"
+	// baseUrl = "http://192.168.0.14:21624"
-	baseUrl = "http://10.40.92.16"
+	// baseUrl = "http://112.29.103.165:21626"
+	// baseUrl = "http://172.20.10.3:8080"
+	// baseUrl = "http://10.40.92.22:8080"
+	// baseUrl = "http://10.40.92.209:8080"
+	baseUrl = "http://10.40.92.2:8080"
 	// #endif
-	// 演示基地址
+	// 基地址
-	/* authPath = `${this.baseUrl}/auth`
+	authPath = `${this.baseUrl}/auth`
 	systemPath = `${this.baseUrl}/system`
 	basePath = `${this.baseUrl}/base`
-	materialPath = `${this.baseUrl}/material` */
+	materialPath = `${this.baseUrl}/material`
-	authPath = `${this.baseUrl}:9200`
-	systemPath = `${this.baseUrl}:9201`
-	basePath = `${this.baseUrl}:9301`
-	materialPath = `${this.baseUrl}:9302`
-	// 14服务器
-	/* authPath = 'http://192.168.0.14:21624/auth'
-	systemPath = 'http://192.168.0.14:21624/system'
-	basePath = 'http://192.168.0.14:21624/base'
-	materialPath = 'http://192.168.0.14:21624/material' */
-	//基地址
-	/* authPath = 'http://169.254.91.222:9200'
-	systemPath = 'http://169.254.91.222:9201'
-	basePath = 'http://169.254.91.222:9301'
-	materialPath = 'http://169.254.91.222:9302' */
 	// 短链
 	serviceUrl = {
 		login: {
 			code: '/sendCode', // 获取验证码
 			checkCode: '/checkCode', // 验证码登录
-			log: '/login', // 账户登录
+			log: '/loginApp', // 账户登录
 		},
 		user: {
 			logOut: '/logout', // 退出登录
 		},
 		index: {
 			noticeCont: '/sysNotice/getList', // 获取公告内容
+			singleNotice: '/sysNotice/getById', // 查看单个公告
 			waitDo: '/app/getToDoList', // 获取待办事项
-			keyData: '/app/getCriticalData' // 获取关键数据
+			keyData: '/app/getCriticalData', // 获取关键数据
+			getUserInfo: '/system/user/getInfo', // 获取用户信息
 		},
 		fetchMaterial: {
 			fetchMaterialList: '/type/selectMaTypeListByLevelIndex', // 获取设备列表
@@ -54,12 +46,19 @@ class HttpConfig {
 		},
 		fetchExam: {
 			fetchExamList: '/tm_task/getLeaseAuditList', // 获取领料审批清单
+			fetchExamListAll: '/tm_task/getLeaseAuditListAll', // 获取领料申请列表
+			fetchTrueExamList: '/tm_task/getLeaseManageListAll', // 获取领料审批列表
+			fetchDetailList: '/tm_task/getLeaseListAll', // 获取领料明细列表
 			subExam: '/tm_task/auditLeaseByCompany', // 通过领料审批
+			rejectExam: '/tm_task/rejectLeaseByCompany', // 驳回领料审批
 		},
 		fetchMaterialOutStore: {
 			fetchInfoByCode: '/leaseOutDetails/getMaMachineByCode', // 根据maId获取机具详情
 			fetchInfoByQrCode: '/leaseOutDetails/getMaMachineByQrCode',
-			subOutStore: '/leaseOutDetails/submitOut', // 领料出库提交
+			subOutStore: '/leaseOutDetails/submitOut', // 领料出库提交-对象
+			subOutStoreArr: '/leaseOutDetails/submitOutRfid', // 领料出库提交-数组
+			fetchSingleDetail: '/tm_task/getLeaseAuditListDetail', // 根据领料id查询领料申请详情
+			searchRfid: '/backReceive/rfidCodeQuery', // 查询rfid
 		},
 		exitMaterial: {
 			exitDeptList: '/back_apply/getbackUnit', // 获取退料单位，工程列表
@@ -75,6 +74,7 @@ class HttpConfig {
 			exitExamList: '/back_apply/examineList', // 获取退料审核列表
 			exitExamDetail: '/back_apply/examineView', // 获取退料审核明细
 			subExitExam: '/back_apply/audit', // 提交单个审核
+			rejectExitExam: '/back_apply/refuse', // 拒绝单个审核
 		},
 		newInStore: {
 			fetchNewInStoreList: '/purchaseInput/list', // 获取新购入库列表
@@ -90,6 +90,7 @@ class HttpConfig {
 			fixCrew: '/repair/getUserSelect', // 获取维修人员
 			maList: '/maPartType/list', // 获取配件树
 			fixFactory: '/supplierInfo/getSupplierSelect', // 获取维修厂家
+			uploadPic: '/sys/file/upload', // 图片上传接口
 		},
 		repairTestInStore: {
 			repairTestInStoreList: '/RepairTestInput/getAppRepairedList', // 获取修试后入库列表
@@ -100,22 +101,51 @@ class HttpConfig {
 			backMaterialReceiveList: '/backReceive/getbackReceiveList', // 获取退料接收列表
 			backMaterialReceiveDetail: '/backReceive/receiveView',
 			backMaterialSetNumBack: '/backReceive/setNumBack',
-		    backMaterialQrcodeQuery:'backReceive/qrcodeQuery',
+		    backMaterialQrcodeQuery:'/backReceive/qrcodeQuery',
-		    backMaterialSetCodeBack:'backReceive/setCodeBack',
+		    backMaterialSetCodeBack:'/backReceive/setCodeBack',
-			backReceiveCodeQuery:"backReceive/codeQuery",
+			backReceiveCodeQuery:"/backReceive/codeQuery",
-			backReceiveEndBack:"backReceive/endBack",
+			backReceiveEndBack:"/backReceive/endBack",
+			seeBackMaterialDetail: '/backReceive/backReceiveRecord', // 查看退料明细
+			searchRfid: '/backReceive/rfidCodeQuery', // 查询rfid
+			subRfid: '/backReceive/setRfidCodeBack', // rfid接收
 		},
 		// 报废审核接口
 		crashExam: {
-			crashExamList: '/dev-api/material/scrap/getScrapTaskList',
+			crashExamList: '/scrap/getScrapTaskList',
-			crashExamDetails: '/dev-api/material/scrap/getScrapAuditList',
+			crashExamDetails: '/scrap/getScrapAuditList',
-			crashExamAudit: '/dev-api/material/scrap/audit',
+			crashExamAudit: '/scrap/audit',
 		},
 		//试验检验接口
 		testExam: {
-			crashExamList: '/dev-api/material/details/questList',
+			testExamList: '/details/questList',
-			crashExamDetails: '/dev-api/material/details/getRepairAuditList',
+			testExamDetails: '/details/getRepairAuditList',
-			crashExamAudit: '/dev-api/material/details/audit',
+			testExamAudit: '/details/audit',
+		},
+		authManage: {
+			fetchAuthList: '/appMenu/getAllMenu', // 获取所有模块数据
+			fetchIsUsing: '/appMenu/getMenuById', // 获取正在使用的模块
+			subAdd: '/appMenu/addMenuById', // 提交新增模块
+			subDel: '/appMenu/delMenuById', // 提交删除模块
+		},
+		searchProjUsing: {
+			fetchProjUsingList: '/leaseOutDetails/proUseRecord', // 获取工程在用列表
+		},
+		searchFetchRecord: {
+			fetchRecordList: '/leaseOutDetails/leaseOutRecord', // 获取领用记录列表
+		},
+		update: {
+			fetchAppVer: '/app/getVersion', // 获取app当前版本号
+		},
+		rfidBinding: {
+			bindRfid: '/leaseOutDetails/bindMachineByRfid', // rifd绑定
+		},
+		qrcodeBinding: {
+			bindQrcode: '/leaseOutDetails/bindMachineByQrCode', // 二维码绑定
+			fetchDeviceType: '/returnOfMaterialsInfo/getMaTypeList', // 获取设备类型
+			fetchDeviceSpec: '/returnOfMaterialsInfo/getInfoListByType', // 获取规格型号
+		},
+		indexScan: {
+			infoByCode: '/machine/getMachineByQrCode', // 首页根据二维码查询设备信息
 		}
 	}
 }

apis/request.js

@@ -90,6 +90,27 @@ class Http{
 			})
 		})
 	}
+	
+	upload(baseUrl='',url,data={},header={}){
+		return new Promise((resolve,reject) => {
+			uni.uploadFile({
+				url:baseUrl + url,
+				filePath: data,
+				header:{
+					'Authorization': uni.getStorageSync('token'),
+					...header
+				},
+				name: 'file',
+				// 成功的回调
+				success(res) {
+					resolve(res)
+				},
+				fail(err) {
+					reject(err)
+				}
+			})
+		})
+	}
 }
 
 export default new Http()

manifest.json

@@ -1,12 +1,15 @@
 {
-    "name" : "SmartStorage",
+    "name" : "智慧仓储",
     "appid" : "__UNI__9D122E1",
     "description" : "",
-    "versionName" : "1.0.0",
+    "versionName" : "1.0.2",
-    "versionCode" : "100",
+    "versionCode" : 102,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
+        "compatible" : {
+            "ignoreVersion" : true
+        },
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
@@ -17,7 +20,10 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Camera" : {},
+            "Barcode" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -47,6 +53,54 @@
             /* SDK配置 */
             "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"
+                },
+                "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"
+                    }
+                }
+            }
+        },
+        "nativePlugins" : {
+            "BNS-RfidRed" : {
+                "__plugin_info__" : {
+                    "name" : "BNS-RfidRed",
+                    "description" : "BNS-RfidRed",
+                    "platforms" : "Android",
+                    "url" : "",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {}
+                }
             }
         }
     },

nativeplugins/BNS-RfidRed/android/libs/META-INF/MANIFEST.MF

@@ -0,0 +1 @@
+