262

manifest.json

@@ -2,8 +2,8 @@
     "name" : "协同办公",
     "appid" : "__UNI__DDA1056",
     "description" : "",
-    "versionName" : "2.0.7",
-    "versionCode" : 207,
+    "versionName" : "2.1.1",
+    "versionCode" : 211,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/swMessage/swMessage.vue

@@ -781,9 +781,6 @@
 			if (options.nodeId == 308 || options.nodeId == 1208) {
 				this.getYjPeo()
 			}
-			setTimeout(() => {
-				that.getContent(options.workid)
-			}, 200)
 
 			that.type = options.type
 			that.workid = options.workid
@@ -791,12 +788,16 @@
 			uni.setNavigationBarTitle({
 				title: options.title
 			})
-			uni.$u.http.get('/getInfo').then(res => {
-				// console.log('‘，', this.content)
-				if (options.flowNo == '003' && this.content.hostDeptId == res.user.dept.deptId) {
-					that.LuobanFile = true
-				}
-				this.permissions = res.permissions
+			that.getContent(options.workid)
+			uni.$u.http.get('/getInfo').then(res1 => {
+
+				// console.log('that.content.hostDeptId', that.content)
+
+				// if (that.flowNo == '003' && that.content.hostDeptId == res1.user.dept.deptId) {
+				// 	that.LuobanFile = true
+				// }
+				that.permissions = res1.permissions
+				console.log(' permissions5', that.permissions)
 			})
 		},
 		onShow() {
@@ -823,9 +824,10 @@
 		},
 		methods: {
 			hasPermission(permission) {
+				let that = this
 				// 检查权限的逻辑
 				// console.log('this.permissions', this.permissions)
-				return this.permissions.includes(permission);
+				return that.permissions.includes(permission);
 			},
 			delFile(itemFile) {
 				// console.log('itemFILE', itemFile)
@@ -938,40 +940,49 @@
 			},
 			//查询收文详情
 			getContent(id) {
+				let that = this
 				uni.$u.http.get('/offcial/receive/sel/' + id).then(res => {
-					this.content = res.data
-					this.content.workid = id
-					if (this.gdType == true) {
-						this.content.typeId = null //归档分类
-						this.content.levels = null //密级
-						this.content.archiveNo = null //档案编号
-						this.content.archiveFormNo = null
-						this.content.printNum = null //打印份数
-						this.content.name = res.data.title //档案名称
-						this.content.gdtype = null //分类名称
+					that.content = res.data
+					that.content.workid = id
+					if (that.gdType == true) {
+						that.content.typeId = null //归档分类
+						that.content.levels = null //密级
+						that.content.archiveNo = null //档案编号
+						that.content.archiveFormNo = null
+						that.content.printNum = null //打印份数
+						that.content.name = res.data.title //档案名称
+						that.content.gdtype = null //分类名称
 					}
-					if (this.type == 0) {
-						this.isOver(this.parameter)
-						this.getBackNo(this.parameter.nodeId)
+					if (that.type == 0) {
+						that.isOver(that.parameter)
+						that.getBackNo(that.parameter.nodeId)
 					}
-					if (this.parameter.nodeId == 308 || this.parameter.nodeId == 1208) {
-						this.content.toEmps = null //移交人员
+					if (that.parameter.nodeId == 308 || that.parameter.nodeId == 1208) {
+						that.content.toEmps = null //移交人员
 						// this.content.toEmpsPeo = null //移交人员
-						this.content.yjMsg = null //移交信息
-						this.yjType = true
+						that.content.yjMsg = null //移交信息
+						that.yjType = true
 					}
-					this.statusLuoban = res.data.emergencyDegree
-					this.statusList.forEach(item => {
+					that.statusLuoban = res.data.emergencyDegree
+					that.statusList.forEach(item => {
 						if (item.dictValue == res.data.emergencyDegree) {
-							this.content.status = item.dictLabel
+							that.content.status = item.dictLabel
 						}
 					})
-					this.wjType.forEach(item => {
+					that.wjType.forEach(item => {
 						if (item.dictValue == res.data.receiveType) {
-							this.content.wjtype = item.dictLabel
+							that.content.wjtype = item.dictLabel
 						}
 					})
+					uni.$u.http.get('/getInfo').then(res1 => {
+						console.log(' res1.user', res1.user)
+						console.log('that.content.hostDeptId', that.content)
 
+						if (that.flowNo == '003' && that.content.hostDeptId == res1.user.dept.deptId) {
+							that.LuobanFile = true
+						}
+						// that.permissions = res.permissions
+					})
 				})
 			},
 			// 查询字典数据详细  紧急程度
@@ -1189,9 +1200,9 @@
 								})
 							})
 						} else {
-							uni.showToast({
-								title: '请上传反馈文件'
-							})
+							// uni.showToast({
+							// 	title: '请上传反馈文件'
+							// })
 						}
 					} else {
 						uni.$u.http.post("/offcial/receive/sendFlowToUsers", this.content, {