浏览代码

fix: 获取不到version信息问题修复

ZhaoJun 1 年之前
父节点
当前提交
3710ddea9f
共有 4 个文件被更改,包括 108 次插入79 次删除
  1. 72 66
      manifest.json
  2. 24 13
      pages/audit/detail.vue
  3. 6 0
      services/bom.js
  4. 6 0
      services/user.js

+ 72 - 66
manifest.json

@@ -1,67 +1,73 @@
 {
-    "name" : "BOM",
-    "appid" : "__UNI__87B699A",
-    "description" : "",
-    "versionName" : "2.0.8",
-    "versionCode" : 208,
-    "transformPx" : false,
-    "app-plus" : {
-        /* 5+App特有相关 */
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "modules" : {},
-        /* 模块配置 */
-        "distribute" : {
-            /* 应用发布信息 */
-            "android" : {
-                /* 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\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            "ios" : {},
-            /* ios打包配置 */
-            "sdkConfigs" : {}
-        }
-    },
-    /* SDK配置 */
-    "quickapp" : {},
-    /* 快应用特有相关 */
-    "mp-weixin" : {
-        /* 小程序特有相关 */
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
-    },
-    "h5" : {
-        "devServer" : {
-            "https" : false,
-            "port" : ""
-        },
-        "router" : {
-            "base" : ""
-        }
-    }
-}
+	"name": "BOM",
+	"appid": "__UNI__87B699A",
+	"description": "",
+	"versionName": "2.0.8",
+	"versionCode": 208,
+	"transformPx": false,
+	"app-plus": {
+		/* 5+App特有相关 */
+		"usingComponents": true,
+		"nvueCompiler": "uni-app",
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		"modules": {},
+		/* 模块配置 */
+		"distribute": {
+			/* 应用发布信息 */
+			"android": {
+				/* 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\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			"ios": {},
+			/* ios打包配置 */
+			"sdkConfigs": {}
+		}
+	},
+	/* SDK配置 */
+	"quickapp": {},
+	/* 快应用特有相关 */
+	"mp-weixin": {
+		/* 小程序特有相关 */
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"h5": {
+		"devServer": {
+			"https": false,
+			"port": "",
+			"proxy": {
+				"/api": {
+					"target": "http://47.96.12.136:8896", // 后端接口的基础地址
+					"changeOrigin": true // 支持跨域
+				}
+			}
+		},
+		"router": {
+			"base": ""
+		}
+	}
+}

+ 24 - 13
pages/audit/detail.vue

@@ -47,8 +47,8 @@
 
 		<!-- 审批拒绝弹窗 -->
 		<uni-popup ref="rejectPopup" type="dialog">
-			<uni-popup-dialog mode="input" placeholder="请输入拒绝原因" :duration="2000" :before-close="true"
-				@close="rejectClose" @confirm="rejectConfirm"></uni-popup-dialog>
+			<uni-popup-dialog mode="input" placeholder="请输入拒绝原因" :duration="2000" :before-close="true" @close="rejectClose"
+				@confirm="rejectConfirm"></uni-popup-dialog>
 		</uni-popup>
 	</view>
 </template>
@@ -59,7 +59,11 @@
 		queryAttachment,
 		queryAuditList,
 		approve,
+		queryVersionDetail,
 	} from "@/services/bom.js"
+	import {
+		gerCurrentUser
+	} from "@/services/user.js"
 	import previewFile from "@/components/preview-file/preview-file.vue"
 
 	export default {
@@ -91,7 +95,7 @@
 			this.templateNodeId = options.templateNodeId
 			this.versionId = options.versionId
 			this.projectId = Number(options.projectId)
-			if(!uni.getStorageSync('token')){
+			if (!uni.getStorageSync('token')) {
 				uni.setStorageSync("token", options['JWT-TOKEN']);
 			}
 			this.options = options
@@ -99,14 +103,21 @@
 		},
 		methods: {
 			async init() {
-				var {
-					data: {
-						excel_version_tree: versionList
-					}
-				} = await queryVersionsList({
-					template_node_id: this.templateNodeId
-				});
-				var version = versionList.find(v => v.id == this.versionId);
+				var currentUser = await gerCurrentUser();
+				console.log(currentUser);
+				if(!currentUser){
+					return
+				}
+				// http://localhost:8080/#/pages/audit/detail?templateNodeId=3025&versionId=2878&projectId=404&JWT-TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJJRCI6NDQ4LCJVc2VybmFtZSI6IkdULTI1OC0xIiwiRGVwIjoiMTE3IiwiZXhwIjoxNjkxNjYwMTUxLCJpc3MiOiJnaW4tYmxvZyJ9.eTtec0VDywPFsgG9NZmIpncwS015MbxkP6I4goD20x8
+				// var {
+				// 	data: {
+				// 		excel_version_tree: versionList
+				// 	}
+				// } = await queryVersionsList({
+				// 	template_node_id: this.templateNodeId
+				// });
+				// var version = versionList.find(v => v.id == this.versionId);
+				var version = await queryVersionDetail({userID: currentUser.ID, versionID: this.versionId})
 				if (version.flow_id) {
 					this.getFlow(version)
 				}
@@ -226,7 +237,7 @@
 							this.isAuditor = true;
 						}
 					}
-					if(this.options['JWT-TOKEN']){
+					if (this.options['JWT-TOKEN']) {
 						this.isAuditor = true;
 					}
 				}
@@ -290,4 +301,4 @@
 		padding-left: 20rpx;
 		margin-bottom: 20rpx;
 	}
-</style>
+</style>

+ 6 - 0
services/bom.js

@@ -36,4 +36,10 @@ export async function queryClassify() {
 // 查询全部项目
 export async function queryProjectList() {
   return request(`v2/approval/record?pageSize=99999`, 'GET');
+}
+
+// 查询单个Version
+export async function queryVersionDetail(params) {
+	const res =  await request(`v1/purchase/bom/get-audit-detail/${params.userID}?version_id=${params.versionID}`, 'GET');
+	return res.data
 }

+ 6 - 0
services/user.js

@@ -0,0 +1,6 @@
+import request from "./request"
+
+export async function gerCurrentUser() {
+  const res = await request(`v2/user/current-user`, 'GET');
+	return res.data
+}