2023-12-11

manifest.json

@@ -2,8 +2,8 @@
     "name" : "协同办公",
     "appid" : "__UNI__EEB5AF5",
     "description" : "",
-    "versionName" : "1.2.0",
-    "versionCode" : 120,
+    "versionName" : "1.4.0",
+    "versionCode" : 140,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/dailyWork/dailyWork.vue

@@ -174,6 +174,7 @@
 		onLoad(options){
 			this.db.fkFlow = options.fkFlow
 			this.yb.fkFlow = options.fkFlow
+			this.sq.fkFlow = options.fkFlow
 			this.type = options.type
 			uni.setNavigationBarTitle({
 				title:options.title

pages/fwMessage/fwMessage.vue

@@ -47,12 +47,23 @@
 								{{content.undertakerUnit}}
 							</view>
 						</u-form-item>
-						<u-form-item label="正文查看:" borderBottom ref="item1">
+						<u-form-item label="文件字号:" borderBottom ref="item1">
+							<!-- <u--input v-model="content.serial" border="none" readonly></u--input> -->
+							<view class="content">
+								{{content. wordNum}}
+							</view>
+						</u-form-item>
+						<u-form-item label="正文查看:" borderBottom ref="item1" v-if="content.sendFile != null">
 							<view>
 								<!-- <u--text mode="link" :text="content.sendFile.name" :href="content.sendFile.url"></u--text> -->
 								<u--text size="30rpx" color="#2979FF" :text="content.sendFile.name" @click="downLoad(content.sendFile.path)"></u--text>
 							</view>
 						</u-form-item>
+						<u-form-item label="附件查看:" borderBottom ref="item1">
+							<view v-if="content.messageFileList != null && content.messageFileList.length != 0 ">
+								<u--text :text="v.name" v-for="(v,i) in content.messageFileList" :key="i" size="30rpx" color="#2979FF" @click="downLoad(v.path)"></u--text>
+							</view>
+						</u-form-item>
 						<view v-if="type==0">
 							<u-form-item label="下一节点:" borderBottom ref="item1" v-if="gdType == false">
 								<uni-data-select v-model="content.jdindex" placeholder="请选择下一节点" :localdata="list" :clear="false" @change="change"></uni-data-select>
@@ -66,9 +77,9 @@
 								<u--textarea v-model="content.reviewMsg" placeholder="请输入审批意见" autoHeight border="none"></u--textarea>
 							</u-form-item>
 							<view v-if="gdType == true">
-								<u-form-item label="密级:" borderBottom ref="item1">
+								<!-- <u-form-item label="密级:" borderBottom ref="item1">
 									<uni-data-select v-model="content.levels" placeholder="请选择密级" :clear="false" :localdata="gd" ></uni-data-select>
-								</u-form-item>
+								</u-form-item> -->
 								<u-form-item label="档案编号:" borderBottom ref="item1" >
 									<u--input v-model="content.archiveNo" placeholder="请输入档案编号" border="none" ></u--input>
 								</u-form-item>
@@ -81,9 +92,24 @@
 									<u--input v-model="content.printNum" placeholder="请输入打印份数" border="none" ></u--input>
 								</u-form-item>
 							</view>
-							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" >
-								<u-button type="primary" text="提交" @click="submit"  v-if="gdType == false"></u-button>
-								<u-button type="primary" text="归档" @click="save"  v-else></u-button>
+							<view v-if="backType == true">
+								<u-form-item label="退回节点:" borderBottom ref="item1">
+									<uni-data-select v-model="content.returnToNodeID" placeholder="请选择节点" :clear="false"
+										:localdata="backlist"></uni-data-select>
+								</u-form-item>
+								<u-form-item label="退回意见:" borderBottom ref="item1" >
+									<u--textarea v-model="content.backMsg" placeholder="请输入退回意见" autoHeight
+										border="none"></u--textarea>
+								</u-form-item>
+							</view>
+							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" v-if="gdType == false">
+								<u-button type="primary" text="提交" @click="submit"  ></u-button>
+							</view>
+							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" v-if="gdType == true">
+								<u-button type="primary" text="归档" @click="save" ></u-button>
+							</view>
+							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" v-if="backType == true">
+								<u-button type="error" text="退回" @click="back" ></u-button>
 							</view>
 						</view>
 						<view style="padding: 20rpx;box-sizing: border-box;" v-else>
@@ -122,41 +148,6 @@
 									</u-steps-item>
 								</view>
 							</u-steps>
-							<!-- <view v-for="(v,i) in record" :key="i" >
-								<view v-if="v.ActionType22 != undefined">
-									<view v-for="(item,index) in v.ActionType22" :key="index" style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-										<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-											{{v.ActionType==2?item.NDFromT+"（"+v.ActionTypeText+"）":item.NDFromT}}
-										</view>
-										<view style="font-size: 28rpx;">
-											收文部门：{{item.NodeData.split("DeptName=")[1]}}
-										</view>
-										<view style="font-size: 28rpx;">
-											处理人：{{item.Exer.split(',')[1]}}
-										</view>
-										<view style="font-size: 28rpx;">
-											处理时间：{{item.RDT}}
-										</view>
-										<view style="font-size: 28rpx;">
-											审核意见：{{item.Msg}}
-										</view>
-									</view>
-								</view>
-								<view v-else style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-									<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-										{{v.ActionType==2?v.NDFromT+"（"+v.ActionTypeText+"）":v.NDFromT}}
-									</view>
-									<view style="font-size: 28rpx;">
-										收文部门：{{v.NodeData.split("DeptName=")[1]}}
-									</view>
-									<view style="font-size: 28rpx;">
-										处理人：{{v.Exer.split(',')[1]}}
-									</view>
-									<view style="font-size: 28rpx;">
-										处理时间：{{v.RDT}}
-									</view>
-								</view>
-							</view> -->
 						</view>
 					</u--form>
 				</view>
@@ -199,41 +190,7 @@
 							</u-steps-item>
 						</view>
 					</u-steps>
-					<!-- <view v-for="(v,i) in record" :key="i" >
-						<view v-if="v.ActionType22 != undefined">
-							<view v-for="(item,index) in v.ActionType22" :key="index" style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-								<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-									{{v.ActionType==2?item.NDFromT+"（"+v.ActionTypeText+"）":item.NDFromT}}
-								</view>
-								<view style="font-size: 28rpx;">
-									收文部门：{{item.NodeData.split("DeptName=")[1]}}
-								</view>
-								<view style="font-size: 28rpx;">
-									处理人：{{item.Exer.split(',')[1]}}
-								</view>
-								<view style="font-size: 28rpx;">
-									处理时间：{{item.RDT}}
-								</view>
-								<view style="font-size: 28rpx;">
-									审核意见：{{item.Msg}}
-								</view>
-							</view>
-						</view>
-						<view v-else style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-							<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-								{{v.ActionType==2?v.NDFromT+"（"+v.ActionTypeText+"）":v.NDFromT}}
-							</view>
-							<view style="font-size: 28rpx;">
-								收文部门：{{v.NodeData.split("DeptName=")[1]}}
-							</view>
-							<view style="font-size: 28rpx;">
-								处理人：{{v.Exer.split(',')[1]}}
-							</view>
-							<view style="font-size: 28rpx;">
-								处理时间：{{v.RDT}}
-							</view>
-						</view>
-					</view> -->
+					
 				</view>
 			</swiper-item>
 		</swiper>
@@ -273,14 +230,18 @@
 				parameter:null,
 				//已下载附件
 				list2:[],
-				list3:[]
+				list3:[],
+				//退回状态
+				backType:false,
+				//退回节点列表
+				backlist:[]
 			}
 		},
 		onLoad(options) {
 			let that = this
+			this.getDicts()
 			this.getContent(options.workid)
 			this.getRecord(options.workid)
-			this.getDicts()
 			this.getgd()
 			this.parameter = options
 			this.type = options.type
@@ -322,6 +283,7 @@
 			getContent(id) {
 				uni.$u.http.get('/offcial/message/messageByWorkId/' + id).then(res => {
 					this.content = res.data
+					this.content.workid = id
 					if(this.gdType == true){
 						this.content.typeId = null //归档分类
 						this.content.levels = null //密级
@@ -333,6 +295,7 @@
 					}
 					if(this.type==0){
 						this.isOver(this.parameter)
+						this.getBackNo(this.parameter.nodeId)
 					}
 					this.statusList.forEach(item => {
 						if (item.dictValue == res.data.emergencyDegree) {
@@ -384,14 +347,6 @@
 						this.content.reviewMsg = null
 						this.content.users = null
 						this.content.userList = null
-						this.content.workid = this.workid
-						// if()
-						// this.content.jdindex = 0
-						// this.content.nodeId = this.list[0].id
-						// this.content.optionName = this.list[0].text
-						// this.content.toNodeId = this.list[0].id
-						// this.id = this.list[0].id
-						// this.DeliveryWay = this.list[0].DeliveryWay
 					}
 				})
 			},
@@ -466,7 +421,7 @@
 					})
 				}else if(this.content.reviewMsg == null){
 					uni.showToast({
-						title:"请填写审核内容",
+						title:"请填写审批意见",
 						icon:"none"
 					})
 				}else{
@@ -523,12 +478,13 @@
 			},
 			//保存归档
 			save(){
-				if(this.content.levels == null){
-					uni.showToast({
-						title:"请选择密级",
-						icon:"none"
-					})
-				}else if(this.content.archiveNo == null){
+				// if(this.content.levels == null){
+				// 	uni.showToast({
+				// 		title:"请选择密级",
+				// 		icon:"none"
+				// 	})
+				// }else 
+				if(this.content.archiveNo == null){
 					uni.showToast({
 						title:"请填写档案编号",
 						icon:"none"
@@ -615,6 +571,80 @@
 					});
 				}
 				
+			},
+			//查询是否能退回
+			getBackNo(id){
+				uni.$u.http.get("/jflow/restful/CurrNodeInfo?currNodeID="+id).then(res=>{
+					if(res[0].ReturnRole != 0){
+						this.getBackList()
+						this.backType = true
+						this.content.returnToNodeID = null
+						this.content.backMsg = null
+					}
+				})
+			},
+			//获取退回节点列表
+			getBackList(){
+				uni.$u.http.get("/jflow/restful/getReturnWorkNode",{
+					params:{
+						workid: this.parameter.workid,
+						token: uni.getStorageSync('jtoken')
+					}
+				}).then(res=>{
+					this.backlist = res.map((item, index) => {
+						let obj = {
+							value: item.No,
+							id: item.No,
+							text: item.Name,
+						}
+						return obj
+					})
+				})
+			},
+			//退回上一节点
+			back(){
+				if(this.content.returnToNodeID == null){
+					uni.showToast({
+						title:"请选择退回节点",
+						icon:"none"
+					})
+				}else if(this.content.backMsg == null){
+					uni.showToast({
+						title:"请填写退回意见",
+						icon:"none"
+					})
+				}else{
+					uni.showLoading({
+						title:"退回中...",
+					})
+					uni.$u.http.get("/offcial/receive/NodeReturnWork",{
+						params:{
+							workid: this.parameter.workid,
+							returnToNodeID: this.content.returnToNodeID,
+							returnMsg:this.content.backMsg
+						}
+					}).then(res=>{
+						uni.hideLoading()
+						uni.showToast({
+							title:res,
+							icon:"none",
+							duration:2000
+						})
+						uni.$emit('query', {
+							a: 'back'
+						})
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 2000)
+					}).catch(error=>{
+						uni.hideLoading()
+						uni.showToast({
+							title:"请稍后重试",
+							icon:"none"
+						})
+					})
+				}
+				
 			}
 		}
 	}

pages/index/index.vue

@@ -118,6 +118,8 @@
 							this.xlList2.push(true)
 						}
 					}
+				}).catch(error=>{
+					uni.hideLoading()
 				})
 			},
 			//获取新闻列表
@@ -140,6 +142,8 @@
 					}
 					this.totalList[this.current] = Math.ceil(res.total / this.fyList[this.current].pageSize)
 					this.$forceUpdate()
+				}).catch(error=>{
+					uni.hideLoading()
 				})
 			},
 			//tabs点击
@@ -257,7 +261,6 @@
 						mask:true
 					})
 					uni.$u.http.post('/app/version/advance/'+wgtinfo.versionCode).then(res => {
-						console.log(res)
 						if(res.code==200){
 							if(res.data != undefined){
 								uni.hideLoading()

pages/inforeview/inforeview.vue

@@ -56,10 +56,10 @@
 								<u--textarea v-model="content.reviewMsg" placeholder="请输入审批意见" autoHeight border="none"></u--textarea>
 							</u-form-item>
 							<view v-if="gdType == true">
-								<u-form-item label="密级:" borderBottom ref="item1">
+								<!-- <u-form-item label="密级:" borderBottom ref="item1">
 									<uni-data-select v-model="content.levels" placeholder="请选择密级" :clear="false"
 										:localdata="gd"></uni-data-select>
-								</u-form-item>
+								</u-form-item> -->
 								<u-form-item label="档案编号:" borderBottom ref="item1">
 									<u--input v-model="content.archiveNo" placeholder="请输入档案编号"
 										border="none"></u--input>
@@ -73,9 +73,24 @@
 									<u--input v-model="content.printNum" placeholder="请输入打印份数" border="none"></u--input>
 								</u-form-item>
 							</view>
-							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" >
-								<u-button type="primary" text="提交" @click="submit"  v-if="gdType == false"></u-button>
-								<u-button type="primary" text="归档" @click="save"  v-else></u-button>
+							<view v-if="backType == true">
+								<u-form-item label="退回节点:" borderBottom ref="item1">
+									<uni-data-select v-model="content.returnToNodeID" placeholder="请选择节点" :clear="false"
+										:localdata="backlist"></uni-data-select>
+								</u-form-item>
+								<u-form-item label="退回意见:" borderBottom ref="item1">
+									<u--textarea v-model="content.backMsg" placeholder="请输入退回意见" autoHeight
+										border="none"></u--textarea>
+								</u-form-item>
+							</view>
+							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" v-if="gdType == false">
+								<u-button type="primary" text="提交" @click="submit"  ></u-button>
+							</view>
+							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" v-if="gdType == true">
+								<u-button type="primary" text="归档" @click="save" ></u-button>
+							</view>
+							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" v-if="backType == true">
+								<u-button type="error" text="退回" @click="back" ></u-button>
 							</view>
 						</view>
 						<view style="padding: 20rpx;box-sizing: border-box;width: 100%;box-sizing: border-box;" v-else>
@@ -114,41 +129,6 @@
 									</u-steps-item>
 								</view>
 							</u-steps>
-							<!-- <view v-for="(v,i) in record" :key="i" >
-								<view v-if="v.ActionType22 != undefined" >
-									<view v-for="(item,index) in v.ActionType22" :key="index" style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-										<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-											{{v.ActionType==2?item.NDFromT+"（"+v.ActionTypeText+"）":item.NDFromT}}
-										</view>
-										<view style="font-size: 28rpx;">
-											收文部门：{{item.NodeData.split("DeptName=")[1]}}
-										</view>
-										<view style="font-size: 28rpx;">
-											处理人：{{item.Exer.split(',')[1]}}
-										</view>
-										<view style="font-size: 28rpx;">
-											处理时间：{{item.RDT}}
-										</view>
-										<view style="font-size: 28rpx;">
-											审核意见：{{item.Msg}}
-										</view>
-									</view>
-								</view>
-								<view v-else style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-									<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-										{{v.ActionType==2?v.NDFromT+"（"+v.ActionTypeText+"）":v.NDFromT}}
-									</view>
-									<view style="font-size: 28rpx;">
-										收文部门：{{v.NodeData.split("DeptName=")[1]}}
-									</view>
-									<view style="font-size: 28rpx;">
-										处理人：{{v.Exer.split(',')[1]}}
-									</view>
-									<view style="font-size: 28rpx;">
-										处理时间：{{v.RDT}}
-									</view>
-								</view>
-							</view> -->
 						</view>
 					</u--form>
 				</view>
@@ -190,41 +170,6 @@
 							</u-steps-item>
 						</view>
 					</u-steps>
-					<!-- <view v-for="(v,i) in record" :key="i" >
-						<view v-if="v.ActionType22 != undefined" >
-							<view v-for="(item,index) in v.ActionType22" :key="index" style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-								<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-									{{v.ActionType==2?item.NDFromT+"（"+v.ActionTypeText+"）":item.NDFromT}}
-								</view>
-								<view style="font-size: 28rpx;">
-									收文部门：{{item.NodeData.split("DeptName=")[1]}}
-								</view>
-								<view style="font-size: 28rpx;">
-									处理人：{{item.Exer.split(',')[1]}}
-								</view>
-								<view style="font-size: 28rpx;">
-									处理时间：{{item.RDT}}
-								</view>
-								<view style="font-size: 28rpx;">
-									审核意见：{{item.Msg}}
-								</view>
-							</view>
-						</view>
-						<view v-else style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-							<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-								{{v.ActionType==2? v.NDFromT+"（"+v.ActionTypeText+"）":v.NDFromT}}
-							</view>
-							<view style="font-size: 28rpx;">
-								收文部门：{{v.NodeData.split("DeptName=")[1]}}
-							</view>
-							<view style="font-size: 28rpx;">
-								处理人：{{v.Exer.split(',')[1]}}
-							</view>
-							<view style="font-size: 28rpx;">
-								处理时间：{{v.RDT}}
-							</view>
-						</view>
-					</view> -->
 				</view>
 			</swiper-item>
 		</swiper>
@@ -265,11 +210,16 @@
 				overType: false, //判断是否结束
 				//上个页面传过来的参数
 				parameter: null,
-				show:false
+				show:false,
+				//退回状态
+				backType:false,
+				//退回节点列表
+				backlist:[]
 			}
 		},
 		onLoad(options) {
 			let that = this
+			this.getDicts() 
 			this.getContent(options.workid)
 			this.getRecord(options.workid)
 			that.parameter = options
@@ -278,7 +228,6 @@
 				that.gdType = true
 				that.getgd()
 			}
-			this.getDicts()
 			// this.getgd()
 			this.type = options.type
 			this.workid = options.workid
@@ -328,6 +277,7 @@
 					}
 					if(this.type==0){
 						this.isOver(this.parameter)
+						this.getBackNo(this.parameter.nodeId)
 					}
 					this.statusList.forEach(item => {
 						if (item.dictValue == res.data.emergencyDegree) {
@@ -524,7 +474,6 @@
 								duration:3000
 							})
 						}
-						
 						uni.$emit('query', {
 							a: 'back'
 						})
@@ -538,12 +487,13 @@
 			},
 			//保存归档
 			save() {
-				if (this.content.levels == null) {
-					uni.showToast({
-						title: "请选择密级",
-						icon: "none"
-					})
-				} else if (this.content.archiveNo == null) {
+				// if (this.content.levels == null) {
+				// 	uni.showToast({
+				// 		title: "请选择密级",
+				// 		icon: "none"
+				// 	})
+				// } else 
+				if (this.content.archiveNo == null) {
 					uni.showToast({
 						title: "请填写档案编号",
 						icon: "none"
@@ -594,6 +544,80 @@
 						})
 					})
 				}
+			},
+			//查询是否能退回
+			getBackNo(id){
+				uni.$u.http.get("/jflow/restful/CurrNodeInfo?currNodeID="+id).then(res=>{
+					if(res[0].ReturnRole != 0){
+						this.getBackList()
+						this.backType = true
+						this.content.returnToNodeID = null
+						this.content.backMsg = null
+					}
+				})
+			},
+			//获取退回节点列表
+			getBackList(){
+				uni.$u.http.get("/jflow/restful/getReturnWorkNode",{
+					params:{
+						workid: this.parameter.workid,
+						token: uni.getStorageSync('jtoken')
+					}
+				}).then(res=>{
+					this.backlist = res.map((item, index) => {
+						let obj = {
+							value: item.No,
+							id: item.No,
+							text: item.Name,
+						}
+						return obj
+					})
+				})
+			},
+			//退回上一节点
+			back(){
+				if(this.content.returnToNodeID == null){
+					uni.showToast({
+						title:"请选择退回节点",
+						icon:"none"
+					})
+				}else if(this.content.backMsg == null){
+					uni.showToast({
+						title:"请填写退回意见",
+						icon:"none"
+					})
+				}else{
+					uni.showLoading({
+						title:"退回中...",
+					})
+					uni.$u.http.get("/offcial/receive/NodeReturnWork",{
+						params:{
+							workid: this.parameter.workid,
+							returnToNodeID: this.content.returnToNodeID,
+							returnMsg:this.content.backMsg
+						}
+					}).then(res=>{
+						uni.hideLoading()
+						uni.showToast({
+							title:res,
+							icon:"none",
+							duration:2000
+						})
+						uni.$emit('query', {
+							a: 'back'
+						})
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 2000)
+					}).catch(error=>{
+						uni.hideLoading()
+						uni.showToast({
+							title:"请稍后重试",
+							icon:"none"
+						})
+					})
+				}
+				
 			}
 		}
 	}

pages/kqdetail/kqdetail.vue

@@ -195,29 +195,29 @@
 					createTime: null,
 					deptId: null,
 					endTime: null,
-					fridayAfternoon: "在岗",
-					fridayMorning: "在岗",
+					fridayAfternoon: "0",
+					fridayMorning: "0",
 					fullName: null,
 					id: null,
 					isSave: null,
 					loginDeptId: null,
-					mondayAfternoon: "在岗",
-					mondayMorning: "在岗",
+					mondayAfternoon: "0",
+					mondayMorning: "0",
 					remark: null,
-					saturdayAfternoon: "休息",
-					saturdayMorning: "休息",
+					saturdayAfternoon: "11",
+					saturdayMorning: "11",
 					sumTableDate: null,
-					sundayAfternoon: "休息",
-					sundayMorning: "休息",
-					thursdayAfternoon: "在岗",
-					thursdayMorning: "在岗",
-					tuesdayAfternoon: "在岗",
-					tuesdayMorning: "在岗",
+					sundayAfternoon: "11",
+					sundayMorning: "11",
+					thursdayAfternoon: "0",
+					thursdayMorning: "0",
+					tuesdayAfternoon: "0",
+					tuesdayMorning: "0",
 					updateBy: null,
 					updateTime: null,
 					userId: null,
-					wednesdayAfternoon: "在岗",
-					wednesdayMorning: "在岗",
+					wednesdayAfternoon: "0",
+					wednesdayMorning: "0",
 					weekEnd: null,
 					weekNumber: null,
 					weekStart: null,
@@ -268,7 +268,7 @@
 					userId: id,
 					weekNumber: num
 				}).then(res => {
-					// console.log(res)
+					console.log(res == '')
 					if (res == '') {
 
 					} else {

pages/login/login.vue

@@ -7,7 +7,7 @@
 		<view
 			style="width: 100%;position: absolute;top: 56%;transform: translateY(-50%);display: flex;justify-content: center;">
 			<view style="width: 60%;">
-				<u--form labelPosition="left" :model="model" :rulse="rules" ref="uForm">
+				<u--form labelPosition="left" ref="uForm" :model="model" :rulse="rules" >
 					<u-form-item label="" prop="username" borderBottom ref="item1">
 						<u--input v-model="model.username" placeholder="请输入账号" border="none" prefixIcon="account-fill"
 							prefixIconStyle="font-size: 54rpx;color: #409EFF"></u--input>

pages/swMessage/swMessage.vue

@@ -50,18 +50,22 @@
 								{{content.status}}
 							</view>
 						</u-form-item>
+						<u-form-item label="文件类型:" borderBottom ref="item1">
+							<view class="content">
+								{{content.wjtype}}
+							</view>
+						</u-form-item>
 						<u-form-item label="正文查看:" borderBottom ref="item1">
 							<view>
 								<!-- <u--text :text="content.sendFile.name" :href="content.sendFile.url"></u--text> -->
 								<u--text size="30rpx" color="#2979FF" :text="content.sendFile.name" @click="downLoad(content.sendFile.path)"></u--text>
 							</view>
 						</u-form-item>
-						<!-- <u-form-item label="附件列表:" borderBottom ref="item1">
-							<view v-if="content.fujianFileList.length != 0 ">
-								<u--text mode="link" :text="v.name" :href="v.url"
-									v-for="(v,i) in content.fujianFileList" :key="i"></u--text>
+						<u-form-item label="附件查看:" borderBottom ref="item1">
+							<view v-if="content.messageFileList != null && content.messageFileList.length != 0 ">
+								<u--text :text="v.name" v-for="(v,i) in content.messageFileList" :key="i" size="30rpx" color="#2979FF" @click="downLoad(v.path)"></u--text>
 							</view>
-						</u-form-item> -->
+						</u-form-item>
 						<view v-if="type==0" style="padding-bottom: 40rpx;">
 							<u-form-item label="下一节点:" borderBottom ref="item1" v-if="overType==false">
 								<uni-data-select v-model="content.jdindex" placeholder="请选择下一节点" :localdata="list" :clear="false"
@@ -78,10 +82,10 @@
 									border="none"></u--textarea>
 							</u-form-item>
 							<view v-if="gdType == true">
-								<u-form-item label="密级:" borderBottom ref="item1">
+								<!-- <u-form-item label="密级:" borderBottom ref="item1">
 									<uni-data-select v-model="content.levels" placeholder="请选择密级" :clear="false"
 										:localdata="gd"></uni-data-select>
-								</u-form-item>
+								</u-form-item> -->
 								<u-form-item label="档案编号:" borderBottom ref="item1">
 									<u--input v-model="content.archiveNo" placeholder="请输入档案编号"
 										border="none"></u--input>
@@ -94,15 +98,26 @@
 								<u-form-item label="打印份数:" borderBottom ref="item1">
 									<u--input v-model="content.printNum" placeholder="请输入打印份数" border="none"></u--input>
 								</u-form-item>
-
 							</view>
-							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;"
-								v-if="gdType == false">
+							<view v-if="backType == true">
+								<u-form-item label="退回节点:" borderBottom ref="item1">
+									<uni-data-select v-model="content.returnToNodeID" placeholder="请选择节点" :clear="false"
+										:localdata="backlist"></uni-data-select>
+								</u-form-item>
+								<u-form-item label="退回意见:" borderBottom ref="item1" >
+									<u--textarea v-model="content.backMsg" placeholder="请输入退回意见" autoHeight
+										border="none"></u--textarea>
+								</u-form-item>
+							</view>
+							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" v-if="gdType == false">
 								<u-button type="primary" text="提交" @click="submit"></u-button>
 							</view>
-							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" v-else>
+							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" v-if="gdType == true">
 								<u-button type="primary" text="归档" @click="save"></u-button>
 							</view>
+							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" v-if="backType == true">
+								<u-button type="error" text="退回" @click="back"></u-button>
+							</view>
 						</view>
 						<view style="padding: 20rpx;box-sizing: border-box;" v-else>
 							<u-steps :current="100" direction="column" v-if="record != null">
@@ -140,41 +155,6 @@
 									</u-steps-item>
 								</view>
 							</u-steps>
-							<!-- <view v-for="(v,i) in record" :key="i" >
-								<view v-if="v.ActionType22 != undefined">
-									<view v-for="(item,index) in v.ActionType22" :key="index" style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-										<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-											{{v.ActionType==2?item.NDFromT+"（"+v.ActionTypeText+"）":item.NDFromT}}
-										</view>
-										<view style="font-size: 28rpx;">
-											收文部门：{{item.NodeData.split("DeptName=")[1]}}
-										</view>
-										<view style="font-size: 28rpx;">
-											处理人：{{item.Exer.split(',')[1]}}
-										</view>
-										<view style="font-size: 28rpx;">
-											处理时间：{{item.RDT}}
-										</view>
-										<view style="font-size: 28rpx;">
-											审核意见：{{item.Msg}}
-										</view>
-									</view>
-								</view>
-								<view v-else style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-									<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-										{{v.ActionType==2?v.NDFromT+"（"+v.ActionTypeText+"）": v.NDFromT}}
-									</view>
-									<view style="font-size: 28rpx;">
-										收文部门：{{v.NodeData.split("DeptName=")[1]}}
-									</view>
-									<view style="font-size: 28rpx;">
-										处理人：{{v.Exer.split(',')[1]}}
-									</view>
-									<view style="font-size: 28rpx;">
-										处理时间：{{v.RDT}}
-									</view>
-								</view>
-							</view> -->
 						</view>
 					</u--form>
 				</view>
@@ -182,41 +162,6 @@
 			</swiper-item>
 			<swiper-item>
 				<view style="padding: 20rpx;box-sizing: border-box;width: 100%;box-sizing: border-box;height: 100%;overflow: auto;">
-					<!-- <view v-for="(v,i) in record" :key="i" >
-						<view v-if="v.ActionType22 != undefined">
-							<view v-for="(item,index) in v.ActionType22" :key="index" style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-								<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-									{{v.ActionType==2?item.NDFromT+"（"+v.ActionTypeText+"）":item.NDFromT}}
-								</view>
-								<view style="font-size: 28rpx;">
-									收文部门：{{item.NodeData.split("DeptName=")[1]}}
-								</view>
-								<view style="font-size: 28rpx;">
-									处理人：{{item.Exer.split(',')[1]}}
-								</view>
-								<view style="font-size: 28rpx;">
-									处理时间：{{item.RDT}}
-								</view>
-								<view style="font-size: 28rpx;">
-									审核意见：{{item.Msg}}
-								</view>
-							</view>
-						</view>
-						<view v-else style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-							<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-								{{v.ActionType==2?v.NDFromT+"（"+v.ActionTypeText+"）":v.NDFromT}}
-							</view>
-							<view style="font-size: 28rpx;">
-								收文部门：{{v.NodeData.split("DeptName=")[1]}}
-							</view>
-							<view style="font-size: 28rpx;">
-								处理人：{{v.Exer.split(',')[1]}}
-							</view>
-							<view style="font-size: 28rpx;">
-								处理时间：{{v.RDT}}
-							</view>
-						</view>
-					</view> -->
 					<u-steps :current="100" direction="column" v-if="record != null">
 						<view v-for="(v,i) in record" :key="i">
 							<view v-if="v.ActionType22 != undefined">
@@ -293,11 +238,19 @@
 				parameter: null,
 				//已下载附件
 				list2:[],
-				list3:[]
+				list3:[],
+				//文件类型
+				wjType:[],
+				//退回状态
+				backType:false,
+				//退回节点列表
+				backlist:[]
 			}
 		},
 		onLoad(options) {
 			let that = this
+			that.getDicts()
+			that.getWjType()
 			that.getContent(options.workid)
 			that.getRecord(options.workid)
 			that.parameter = options
@@ -305,7 +258,6 @@
 				that.gdType = true
 				that.getgd()
 			}
-			that.getDicts()
 			that.type = options.type
 			that.workid = options.workid
 			that.flowNo = options.flowNo
@@ -347,12 +299,19 @@
 					}
 					if(this.type==0){
 						this.isOver(this.parameter)
+						this.getBackNo(this.parameter.nodeId)
+						
 					}
 					this.statusList.forEach(item => {
 						if (item.dictValue == res.data.emergencyDegree) {
 							this.content.status = item.dictLabel
 						}
 					})
+					this.wjType.forEach(item=>{
+						if (item.dictValue == res.data.receiveType) {
+							this.content.wjtype = item.dictLabel
+						}
+					})
 				})
 			},
 			// 查询字典数据详细  紧急程度
@@ -361,6 +320,12 @@
 					this.statusList = res.data
 				})
 			},
+			// 查询字典数据详细  文件类型
+			getWjType() {
+				uni.$u.http.get('/system/dict/data/type/sw_open_type').then(res => {
+					this.wjType = res.data
+				})
+			},
 			//查询归档字典  秘籍
 			getgd() {
 				uni.$u.http.get('/system/dict/data/type/archive_levels').then(res => {
@@ -539,12 +504,13 @@
 			},
 			//保存归档
 			save() {
-				if (this.content.levels == null) {
-					uni.showToast({
-						title: "请选择密级",
-						icon: "none"
-					})
-				} else if (this.content.archiveNo == null) {
+				// if (this.content.levels == null) {
+				// 	uni.showToast({
+				// 		title: "请选择密级",
+				// 		icon: "none"
+				// 	})
+				// } else 
+				if (this.content.archiveNo == null) {
 					uni.showToast({
 						title: "请填写档案编号",
 						icon: "none"
@@ -628,6 +594,79 @@
 					  }
 					});
 				}
+			},
+			//查询是否能退回
+			getBackNo(id){
+				uni.$u.http.get("/jflow/restful/CurrNodeInfo?currNodeID="+id).then(res=>{
+					if(res[0].ReturnRole != 0){
+						this.getBackList()
+						this.backType = true
+						this.content.returnToNodeID = null
+						this.content.backMsg = null
+					}
+				})
+			},
+			//获取退回节点列表
+			getBackList(){
+				uni.$u.http.get("/jflow/restful/getReturnWorkNode",{
+					params:{
+						workid: this.parameter.workid,
+						token: uni.getStorageSync('jtoken')
+					}
+				}).then(res=>{
+					this.backlist = res.map((item, index) => {
+						let obj = {
+							value: item.No,
+							id: item.No,
+							text: item.Name,
+						}
+						return obj
+					})
+				})
+			},
+			//退回上一节点
+			back(){
+				if(this.content.returnToNodeID == null){
+					uni.showToast({
+						title:"请选择退回节点",
+						icon:"none"
+					})
+				}else if(this.content.backMsg == null){
+					uni.showToast({
+						title:"请填写退回意见",
+						icon:"none"
+					})
+				}else{
+					uni.showLoading({
+						title:"退回中...",
+					})
+					uni.$u.http.get("/offcial/receive/NodeReturnWork",{
+						params:{
+							workid: this.parameter.workid,
+							returnToNodeID: this.content.returnToNodeID,
+							returnMsg:this.content.backMsg
+						}
+					}).then(res=>{
+						uni.hideLoading()
+						uni.showToast({
+							title:res,
+							icon:"none",
+							duration:2000
+						})
+						uni.$emit('query', {
+							a: 'back'
+						})
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 2000)
+					}).catch(error=>{
+						uni.hideLoading()
+						uni.showToast({
+							title:"请稍后重试",
+							icon:"none"
+						})
+					})
+				}
 				
 			}
 		}

pages/workInfo/workInfo.vue

@@ -105,50 +105,27 @@
 									</view>
 								</u-form-item>
 							</view>
-							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;"
-								v-if="gdType == false">
-								<u-button type="primary" text="提交" @click="submit"></u-button>
+							<view v-if="backType == true">
+								<u-form-item label="退回节点:" borderBottom ref="item1">
+									<uni-data-select v-model="content.returnToNodeID" placeholder="请选择节点" :clear="false"
+										:localdata="backlist"></uni-data-select>
+								</u-form-item>
+								<u-form-item label="退回意见:" borderBottom ref="item1">
+									<u--textarea v-model="content.backMsg" placeholder="请输入退回意见" autoHeight
+										border="none"></u--textarea>
+								</u-form-item>
+							</view>
+							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" v-if="gdType == false">
+								<u-button type="primary" text="提交" @click="submit"  ></u-button>
 							</view>
-							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" v-else>
-								<u-button type="primary" text="归档" @click="save"></u-button>
+							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" v-if="gdType == true">
+								<u-button type="primary" text="归档" @click="save" ></u-button>
+							</view>
+							<view style="margin-top: 40rpx;padding: 0 20rpx;box-sizing: border-box;" v-if="backType == true">
+								<u-button type="error" text="退回" @click="back" ></u-button>
 							</view>
 						</view>
 						<view style="padding: 20rpx;box-sizing: border-box;" v-else>
-							<!-- <view v-for="(v,i) in record" :key="i" >
-								<view v-if="v.ActionType22 != undefined">
-									<view v-for="(item,index) in v.ActionType22" :key="index" style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-										<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-											{{v.ActionType==2?item.NDFromT+"（"+v.ActionTypeText+"）":item.NDFromT}}
-										</view>
-										<view style="font-size: 28rpx;">
-											收文部门：{{item.NodeData.split("DeptName=")[1]}}
-										</view>
-										<view style="font-size: 28rpx;">
-											处理人：{{item.Exer.split(',')[1]}}
-										</view>
-										<view style="font-size: 28rpx;">
-											处理时间：{{item.RDT}}
-										</view>
-										<view style="font-size: 28rpx;">
-											审核意见：{{item.Msg}}
-										</view>
-									</view>
-								</view>
-								<view v-else style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-									<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-										{{v.ActionType==2?v.NDFromT+"（"+v.ActionTypeText+"）":v.NDFromT}}
-									</view>
-									<view style="font-size: 28rpx;">
-										收文部门：{{v.NodeData.split("DeptName=")[1]}}
-									</view>
-									<view style="font-size: 28rpx;">
-										处理人：{{v.Exer.split(',')[1]}}
-									</view>
-									<view style="font-size: 28rpx;">
-										处理时间：{{v.RDT}}
-									</view>
-								</view>
-							</view> -->
 							<u-steps :current="100" direction="column" v-if="record != null">
 								<view v-for="(v,i) in record" :key="i">
 									<view v-if="v.ActionType22 != undefined">
@@ -192,41 +169,6 @@
 			<swiper-item>
 				<view
 					style="padding: 20rpx;box-sizing: border-box;width: 100%;box-sizing: border-box;height: 100%;overflow: auto;">
-					<!-- <view v-for="(v,i) in record" :key="i"  >
-						<view v-if="v.ActionType22 != undefined">
-							<view v-for="(item,index) in v.ActionType22" :key="index" style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-								<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-									{{v.ActionType==2?item.NDFromT+"（"+v.ActionTypeText+"）":item.NDFromT}}
-								</view>
-								<view style="font-size: 28rpx;">
-									收文部门：{{item.NodeData.split("DeptName=")[1]}}
-								</view>
-								<view style="font-size: 28rpx;">
-									处理人：{{item.Exer.split(',')[1]}}
-								</view>
-								<view style="font-size: 28rpx;">
-									处理时间：{{item.RDT}}
-								</view>
-								<view style="font-size: 28rpx;">
-									审核意见：{{item.Msg}}
-								</view>
-							</view>
-						</view>
-						<view v-else style="border-radius: 10rpx;box-shadow: 0 0 10rpx #ccc;padding: 20rpx;margin-bottom: 30rpx;">
-							<view style="font-size: 32rpx;padding-bottom: 6rpx;border-bottom: 1px solid #ccc;margin-bottom: 6rpx;">
-								{{v.ActionType==2?v.NDFromT+"（"+v.ActionTypeText+"）":v.NDFromT}}
-							</view>
-							<view style="font-size: 28rpx;">
-								收文部门：{{v.NodeData.split("DeptName=")[1]}}
-							</view>
-							<view style="font-size: 28rpx;">
-								处理人：{{v.Exer.split(',')[1]}}
-							</view>
-							<view style="font-size: 28rpx;">
-								处理时间：{{v.RDT}}
-							</view>
-						</view>
-					</view> -->
 					<u-steps :current="100" direction="column" v-if="record != null">
 						<view v-for="(v,i) in record" :key="i">
 							<view v-if="v.ActionType22 != undefined">
@@ -302,19 +244,23 @@
 				//上个页面传过来的参数
 				parameter: null,
 				fkFlow:null,// 006 中层出差  007 外出授课备案
+				//退回状态
+				backType:false,
+				//退回节点列表
+				backlist:[]
 			}
 		},
 		onLoad(options) {
 			let that = this
 			that.parameter = options
 			that.fkFlow = options.fkFlow
+			that.getDicts()
 			that.getContent(options.workid)
 			that.getRecord(options.workid)
 			if (options.nodeName.indexOf('归档') != -1) {
 				that.gdType = true
-				that.getgd()
+				// that.getgd()
 			}
-			that.getDicts()
 			that.type = options.type
 			that.workid = options.workid
 			that.flowNo = options.flowNo
@@ -355,7 +301,6 @@
 						this.content = res.data
 						if (this.gdType == true) {
 							this.content.typeId = null //归档分类
-							this.content.levels = null //密级
 							this.content.archiveNo = null //档案编号
 							this.content.archiveFormNo = null
 							this.content.printNum = null //打印份数
@@ -364,6 +309,7 @@
 						}
 						if(this.type==0){
 							this.isOver(this.parameter)
+							this.getBackNo(this.parameter.nodeId)
 						}
 						this.statusList.forEach(item => {
 							if (item.dictValue == res.data.emergencyDegree) {
@@ -377,7 +323,6 @@
 						this.content = res.data
 						if (this.gdType == true) {
 							this.content.typeId = null //归档分类
-							this.content.levels = null //密级
 							this.content.archiveNo = null //档案编号
 							this.content.archiveFormNo = null
 							this.content.printNum = null //打印份数
@@ -386,6 +331,7 @@
 						}
 						if(this.type==0){
 							this.isOver(this.parameter)
+							this.getBackNo(this.parameter.nodeId)
 						}
 						this.statusList.forEach(item => {
 							if (item.dictValue == res.data.emergencyDegree) {
@@ -447,12 +393,12 @@
 						flowNo: flow
 					}
 				}).then(res => {
-					this.id = res[0].id
+					this.id = res[0].NodeID
 					this.content.jdindex = 0 //下一节点索引
 					this.DeliveryWay = res[0].DeliveryWay //下一节点状态
-					this.content.toNodeId = res[0].id //下一节点ID
-					this.content.nodeId = res[0].id //下一节点ID
-					this.content.optionName = res[0].text //节点名称
+					this.content.toNodeId = res[0].NodeID //下一节点ID
+					this.content.nodeId = res[0].NodeID //下一节点ID
+					this.content.optionName = res[0].Name //节点名称
 					this.list = res.map((item, index) => {
 						let obj = {
 							value: index,
@@ -618,6 +564,80 @@
 						})
 					})
 				}
+			},
+			//查询是否能退回
+			getBackNo(id){
+				uni.$u.http.get("/jflow/restful/CurrNodeInfo?currNodeID="+id).then(res=>{
+					if(res[0].ReturnRole != 0){
+						this.getBackList()
+						this.backType = true
+						this.content.returnToNodeID = null
+						this.content.backMsg = null
+					}
+				})
+			},
+			//获取退回节点列表
+			getBackList(){
+				uni.$u.http.get("/jflow/restful/getReturnWorkNode",{
+					params:{
+						workid: this.parameter.workid,
+						token: uni.getStorageSync('jtoken')
+					}
+				}).then(res=>{
+					this.backlist = res.map((item, index) => {
+						let obj = {
+							value: item.No,
+							id: item.No,
+							text: item.Name,
+						}
+						return obj
+					})
+				})
+			},
+			//退回上一节点
+			back(){
+				if(this.content.returnToNodeID == null){
+					uni.showToast({
+						title:"请选择退回节点",
+						icon:"none"
+					})
+				}else if(this.content.backMsg == null){
+					uni.showToast({
+						title:"请填写退回意见",
+						icon:"none"
+					})
+				}else{
+					uni.showLoading({
+						title:"退回中...",
+					})
+					uni.$u.http.get("/offcial/receive/NodeReturnWork",{
+						params:{
+							workid: this.parameter.workid,
+							returnToNodeID: this.content.returnToNodeID,
+							returnMsg:this.content.backMsg
+						}
+					}).then(res=>{
+						uni.hideLoading()
+						uni.showToast({
+							title:res,
+							icon:"none",
+							duration:2000
+						})
+						uni.$emit('query', {
+							a: 'back'
+						})
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 2000)
+					}).catch(error=>{
+						uni.hideLoading()
+						uni.showToast({
+							title:"请稍后重试",
+							icon:"none"
+						})
+					})
+				}
+				
 			}
 		}
 	}

utils/request/index.js

@@ -1,6 +1,6 @@
 // 根域名
-var baseUrl = 'http://121.28.24.104:13898/app/';
-// var baseUrl = 'http://192.168.1.52:8080';
+// var baseUrl = 'http://121.28.24.104:13898/app/';
+var baseUrl = 'http://192.168.1.52:8080';
  
 module.exports = (vm) => {
     // 初始化请求配置：config 为默认全局配置