调整

components/ApproveInfo.vue

@@ -53,14 +53,19 @@
 								<template v-if="item.type.indexOf('text')>-1">
 								<u-input v-if="item.isEdit" v-model="formData[item.key]" :placeholder="'请输入'+item.text"
 									:placeholderStyle="placeholderStyle" class="oawork-line"
-									:customStyle="{textAlign: 'right'}" />
+									:customStyle="{textAlign: 'right1'}" />
 									<span  v-else >{{formData[item.key]}}</span>
 										
 									
 								</template>
 								<template v-if="item.type.indexOf('textnumber')>-1">
-									{{formData[item.key]}}
-		
+									
+									
+									<u-input v-if="item.isEdit"  type="number" v-model="formData[item.key]" :placeholder="'请输入'+item.text"
+										:placeholderStyle="placeholderStyle" class="oawork-line"
+										:customStyle="{textAlign: 'right1'}" />
+										<span  v-else >{{formData[item.key]}}</span>
+										
 								</template>
 		
 								<template v-if="item.type.indexOf('radio')>-1">

config/.env.dev.js

@@ -10,11 +10,11 @@ const UNI_APP = {
 	
 	NODE_ENV :"dev",
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
-
+	//openId:"1234",//开发人员2
 	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 
 	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
 	openId:"oBEnI6GDWCRQqn_xlyPlCYFY8Amg",//zkx
-	//openId:"oBEnI6FVaHBZOgnxVa70ePPIBd68",//sz
+	openId:"oBEnI6FVaHBZOgnxVa70ePPIBd68",//sz
 	//
 	//openId:"oBEnI6DtjgbX65mL4_nUFtVgo-8Y",
 	openId:"oBEnI6PiaBMNUMTnjT0ffT1R2JOk",//杨所

pages/oawork/approve/info.vue

@@ -180,7 +180,7 @@
 					title: "加载中",
 					mask: true,
 				})
-
+				this.isApproveUser=false
 				API.processDetails({
 					formId: this.oatype,
 					id: this.id
@@ -189,12 +189,16 @@
 					this.activityList = res.data.activityList
 					var applyContent = res.data.applyContent
 					this.isApproveUser=res.data.isApproveUser;
-					if(this.isApproveUser){
+					for(var i in this.fieldList){
+						var item= this.fieldList[i]
+						item.isEdit=0
+					}
+					if(this.isApproveUser&&applyContent&&applyContent.status==0){
 						this.stepNum=-1;
 						this.stepNum=this.activityList.findIndex(item=>{
 							return item.status==1
 						})
-						console.log(this.stepNum)
+						
 						for(var i in this.fieldList){
 							var item= this.fieldList[i]
 							item.isEdit=0
@@ -207,7 +211,13 @@
 								}
 								if(item.role.indexOf("step0")>-1){
 									item.isEdit=1
-								}
+								}
+								if(this.stepNum==this.activityList.length-1){
+									if(item.role.indexOf("step9")>-1){
+										item.isEdit=1
+									}
+								}
+								
 							}
 							
 						}

pages/oawork/approve/list.vue

@@ -124,7 +124,7 @@
 			},
 			ckInfo(info){
 				var url=""
-				if(info.status==0){
+				if(info.status==0&&this.current==0){
 					url="/pages/oawork/approve/info"
 				}else{
 					url="/pages/oawork/approve/view"

pages/oawork/approve/view.vue

@@ -104,7 +104,11 @@
 					formId: this.oatype,
 					id: this.id
 				}).then((res) => {
-					uni.hideLoading();
+					uni.hideLoading();
+					for(var i in this.fieldList){
+						var item= this.fieldList[i]
+						item.isEdit=0
+					}
 					this.activityList = res.data.activityList
 					var applyContent = res.data.applyContent
 					this.init()

pages/oawork/business/add.vue

@@ -376,6 +376,16 @@
 				}).then((res) => {
 					uni.hideLoading();
 					this.activityList = res.data.activityList
+					if(this.activityList.length==0){
+						this.isReady=false;
+						 
+						uni.showToast({
+							title: "未配置审批流程，请联系管理员",
+							icon: "none"
+						})
+					}else{
+						this.isReady=true;
+					}
 					var applyContent = res.data.applyContent
 					this.init()
 					if(applyContent){

pages/oawork/data/oa2.js

@@ -8,16 +8,7 @@ var obj={
 			name:"标题"
 		}],
 		list:[
-			{
-				key:"fileNumber",
-				type:["text","width49"],
-				text:"文件编号",		
-			},
-			{
-				key:"printing",
-				type:["textnumber","width49"],
-				text:"印数",		
-			},
+			
 			{
 				key:"draftedBy",
 				type:["text","width49"],
@@ -45,21 +36,52 @@ var obj={
 				text:"主题词",
 				
 			},
+			
+			
+			{
+				key:"annexFile",
+				type:["upload"],
+				text:"附件",
+				
+			},
+			{
+				key:"divider",
+				type:["uview","divider","paddingTop"],
+				view:1,
+				text:"审批人可编辑",
+				role:["step0"]   ,
+				
+			},
+			{
+				key:"fileNumber",
+				type:["text","width49"],
+				text:"文件编号",	
+				role:["step0","0"]   ,
+			},
+			{
+				key:"printing",
+				type:["textnumber","width49"],
+				text:"印数",		
+				role:["step0","0"]   ,
+			},
 			{
 				key:"mainDelivery",
 				type:["text"],
 				text:"主送",
+				role:["step0","0"]   ,
 			},
 			{
 				key:"makeCopy",
 				type:["text"],
 				text:"抄送",
+				role:["step0","0"]   ,
 			},
-			
 			{
-				key:"annexFile",
-				type:["upload"],
-				text:"附件",
+				key:"stepBtn",
+				type:["uview","stepBtn","paddingTop"],
+				view:1,
+				text:"调整",
+				role:["step0"]   ,
 				
 			},
 			

pages/oawork/data/oa3.js

@@ -65,7 +65,7 @@ var obj={
 				key:"divider",
 				type:["uview","divider","paddingTop"],
 				view:1,
-				text:"审批人(第一步)可编辑",
+				text:"由审批人(第一步)编辑",
 				role:["step1"]   ,
 				
 			},
@@ -82,7 +82,7 @@ var obj={
 				type:["radio","itemrow"],
 				text:"1.合同业务是否合规",
 				role:["step1"]   ,
-				// 0 申请人填写，1 全部可编辑，step0  审批人可审批,step1,  第一步可填写，
+				// 0 申请人填写，1 全部可编辑，step0  审批人可审批,step1,  第一步可填写，step0  审批人可审批,step9,  最后可填写，
 			},
 			{
 				key:"passedOrNot",

pages/oawork/data/oa8.js

@@ -39,12 +39,7 @@ var obj={
 				isrequset:0
 			},
 			
-			{
-				key:"conferenceRemark",
-				type:["textlong"],
-				text:"发布时间及发布人",
-				isrequset:0
-			},
+			
 			
 			
 			{
@@ -53,8 +48,29 @@ var obj={
 				text:"附件",
 				
 			},
-			
-			
+			{
+				key:"divider",
+				type:["uview","divider","paddingTop"],
+				view:1,
+				text:"审批人(最后一步)可编辑",
+				role:["step1"]   ,
+				
+			},
+			{
+				key:"conferenceRemark",
+				type:["textlong"],
+				text:"发布时间及发布人",
+				isrequset:0,
+				role:["step9","0"]   ,
+			},
+			{
+				key:"stepBtn",
+				type:["uview","stepBtn","paddingTop"],
+				view:1,
+				text:"填写发布时间及发布人",
+				role:["step9"]   ,
+				
+			},
 			
 		]
 	}