提交

components/ApproveInfo.vue

@@ -1,14 +1,31 @@
 <template>
-	<view>
-		<view class="head-approve">
-			<view class="title">
-				{{fieldInfo.title}}
-			</view>
-			<view class="title">
-				<span :style="{color:recordStatusColor(formData.status)}">{{formData.statusN}}</span>
-				
-			</view>
-		</view>
+	<view>
+		<vew  class="head-approve-main" >
+			<view class="head-approve">
+				<view class="head-approve-a">
+					<view class="head-approve-a1">
+						<u-avatar size="36" :src="formData.headImg" class="img"></u-avatar>
+						<view class="head-approve-2">
+							{{formData.applyPersonName}}
+						</view>
+					</view>
+					
+					<view class="head-approve-3">申请了<span  class="head-approve-2" style="color:#2196F3;">{{fieldInfo.title}}</span></view>
+				</view>
+				<view  class="head-approve-b" :style="{
+						color:recordStatusColor(formData.status),
+						borderColor:recordStatusColor(formData.status),
+						}" >
+					<span >{{formData.statusN}}</span>
+				</view>
+				
+			</view>
+			<view class="head-approve-info">
+				<view>申请人部门：{{formData.orgName}}</view>
+				<view>申请时间：{{formData.createTime}}</view>
+			</view>
+		</vew>
+		
 		<view class="businessMain" :style="'font-size:'+fieldInfo.fontsize+'rpx'">
 		
 		
@@ -48,13 +65,7 @@
 											{{item.name}}
 										</u-radio>
 									</u-radio-group>
-									<!-- {{radioListDefault.length}}
-									<u-radio-group >
-										<u-radio v-for="(radItem, radIndex) in radioListDefault"
-											:key="radIndex+'_'+item.key" :name="radItem.value">
-											{{radItem.name}}
-										</u-radio>
-									</u-radio-group> -->
+									
 		
 								</template>
 		
@@ -88,9 +99,11 @@
 					<view class="oawork-item2">
 		
 						<template v-if="item.type.indexOf('textlong')>-1">
-							<u-input v-model="formData[item.key]"  placeholder="" :disabled="true"
+						
+							 
+							<u-input  v-model="formData[item.key]"  placeholder="" :disabled="true"
 								:placeholderStyle="placeholderStyle" class="oawork-line" type="textarea" />
-		
+							
 						</template>
 						<template v-if="item.type.indexOf('upload')>-1">
 							<view class="upload">
@@ -130,6 +143,7 @@
 			personInfo: {},
 			createTime: "",
 			createTime2: "",
+			stepNum:"",
 		
 			fileList:{
 				type: Array,
@@ -159,6 +173,7 @@
 		},
 		data() {
 			return {
+				stepSubmit:false,
 				radioListDefault: [{
 					name: '是',
 					value: '1'
@@ -173,6 +188,16 @@
 			
 		},
 		methods:{
+			// getRole(item){
+			// 	if(item.role){
+			// 		if(item.role.indexOf("step1")>-1){
+			// 			this.stepSubmit=true
+			// 			return true
+			// 		}
+			// 	}else{
+			// 		return false
+			// 	}
+			// },
 			onEditorReady(html) {
 				// #ifdef MP-BAIDU
 				this.editorCtx = requireDynamicLib('editorLib').createEditorContext('editor');
@@ -276,11 +301,12 @@
 
 				.oawork-item1_a {
 					min-width: 160rpx;
-					font-weight: bold;
+					//font-weight: bold;
+					color: #777777;
 				}
 
 				.oawork-item1_b {
-					color: #777777;
+					//color: #777777;
 					width: 100%;
 					text-align: right;
 				}
@@ -344,7 +370,8 @@
 			padding: 4rpx 0px 4rpx 20rpx;
 			width: 49%;
 
-			.oawork-item1_a {
+			.oawork-item1_a {
+				font-size: 28rpx;
 				min-width: 140rpx !important;
 			}
 		}
@@ -368,16 +395,46 @@
 		.submitBtn60 {
 			width: 60%;
 		}
-	}
-	.head-approve{
-		      font-weight: bold;
-		      padding: 8px 8px;
-		    background: #ffffff;
-		    margin-bottom: 8px;
-			display: flex;
-		    flex-wrap: wrap;
-		    justify-content: space-between;
-			font-size: 36rpx;
+	}
+	.head-approve-main{
+		background: #ffffff;
+		.head-approve-info{
+			background: #ffffff;
+			margin-bottom: 8px;
+			padding: 0px 8px 8px 8px;
+		}
+		.head-approve{
+			padding: 8px 8px;
+			background: #ffffff;
+			
+			
+			font-size: 32rpx;
+				
+					 display: flex;
+					 flex-wrap: wrap;
+					  align-items: center;
+					 justify-content: space-between;
+			   
+				.head-approve-a{
+						display: flex;
+						align-items: center;
+				}
+				.head-approve-a1{
+						display: flex;
+						align-items: center;
+				}
+				.head-approve-2{
+					padding: 0 3px
+				}
+				.head-approve-b{
+						padding: 2px 9px;
+						border: 1px solid;
+						border-radius: 18px;
+							font-size: 24rpx;
+				}
+				
+				
+		}
 	}
 	//@import "../data/editor-icon.css";
 	.ql-containerMain{

components/ApproveView.vue

@@ -25,8 +25,8 @@
 								}" >
 									{{item.activityName}}<span class="approveItem_a1_text1or" v-if="item.operation=='or'&&item.wfProcinstActUserList.length>1">或签</span>
 								</view>
-								<view class="approveItem_a1_text2" v-if="0">
-									{{item.remark}}
+								<view class="approveItem_a1_text2" v-if="item.action!=0" >
+									{{item.finishTime}}
 								</view>
 								<view class="approveItem_a1_text3">
 									<view class="approveItem_a1_text3Img" v-for="(it,j) in (item.wfProcinstActUserList)"
@@ -43,13 +43,16 @@
 												<view class="approveItem_a1_text3Img_item1_2a"
 												> {{it.departmentName}}</view>
 												<view class="approveItem_a1_text3Img_item1_2b"
-												><span v-if="it.type==2" class="viewc">抄送</span>{{it.personName}}</view>
+												><span v-if="it.type==2" class="viewc">抄送</span>{{it.personName}}</view>
+												
 											</view>
 										</view>
 										<view v-if="initStart&&it.type==1&&it.action!=0"  class="approveItem_a1_text3Img_item2" >
 											<view>
 												审批结果：<span :style="it.action==1?'color:#4CAF50':'color:red'">[{{it.action==1?'通过':'退回'}}]</span>
-											</view>
+												
+											</view>
+											<view>{{it.finishTime}}</view>
 											<view >
 												审批意见：<br/>{{it.remark}}
 											

config/.env.dev.js

@@ -4,7 +4,7 @@ const UNI_APP = {
 	//BASE_URL: 'http://192.168.33.220:8086/',
 	IMG_URL:"http://www.jsrailway.com.cn/",
 	
-	BASE_URL:'http://192.168.77.162:8086/railroad-server/',
+	//BASE_URL:'http://192.168.77.162:8086/railroad-server/',
 	//BASE_URL:'http://192.168.77.222:8086/railroad-server/',
 
 	
@@ -13,8 +13,8 @@ const UNI_APP = {
 
 	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 
 	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
-	//openId:"oBEnI6GDWCRQqn_xlyPlCYFY8Amg",//zkx
-	openId:"oBEnI6FVaHBZOgnxVa70ePPIBd68",//sz
+	openId:"oBEnI6GDWCRQqn_xlyPlCYFY8Amg",//zkx
+	//openId:"oBEnI6FVaHBZOgnxVa70ePPIBd68",//sz
 	//
 	//openId:"oBEnI6DtjgbX65mL4_nUFtVgo-8Y",
 	openId:"oBEnI6PiaBMNUMTnjT0ffT1R2JOk",//杨所

pages/oawork/approve/info.vue

@@ -3,7 +3,7 @@
 		<u-navbar title="详情审批">
 		
 		</u-navbar>
-		<approve-info  v-if="viewApproveBl"
+		<approve-info  v-if="viewApproveBl" :stepNum="stepNum"
 		:fieldInfo="fieldInfo" :formData="formData" :fileList="fileList" ></approve-info>
 		
 		<view class="submitBtn" v-if="isApproveUser">
@@ -93,7 +93,8 @@
 				spText:"",
 				spPopup:false,
 				pid:"",
-				isApproveUser:false,
+				isApproveUser:false,
+				stepNum:-1,
 
 			}
 		},
@@ -166,7 +167,14 @@
 					uni.hideLoading();
 					this.activityList = res.data.activityList
 					var applyContent = res.data.applyContent
-					this.isApproveUser=res.data.isApproveUser;
+					this.isApproveUser=res.data.isApproveUser;
+					if(this.isApproveUser){
+						this.stepNum=-1;
+						this.stepNum=this.activityList.findIndex(item=>{
+							return item.status==1
+						})
+						console.log(this.stepNum)
+					}
 					this.init()
 					if(applyContent){
 						this.formData.id=applyContent.id

pages/oawork/approve/list.vue

@@ -38,6 +38,17 @@
 						</view>
 					</view>
 				</view>
+				<view class="group">
+					<view  class="group1">
+						<view class="name">
+							提交人部门：
+						</view>
+						<view class="value">
+							{{item.departmentName}}
+							
+						</view>
+					</view>
+				</view>
 				<view class="group">
 					<view  class="group1">
 						<view class="name">
@@ -163,7 +174,7 @@
 						];
 					}
 				
-					this.recordsTotal = res.data.recordsTotal;
+					this.formData.recordsTotal = res.data.recordsTotal;
 				}).catch(error => {
 					uni.showToast({
 						title: error,

pages/oawork/business/add.vue

@@ -8,7 +8,9 @@
 
 
 			<view class="businessTitle" v-if="false">{{fieldInfo.title}}</view>
-			<view v-for="(item,i) in fieldList" :key="i" class="oawork-item" :class="getClass(item)">
+			<view v-for="(item,i) in fieldList" :key="i"
+			 v-if="item.role==null||item.role.indexOf('0')>-1||item.role.indexOf('0')>-1"
+			 class="oawork-item" :class="getClass(item)">
 				<template v-if="item.type.indexOf('uview')>-1">
 					<view v-if="item.type.indexOf('divider')>-1">
 						<u-divider bg-color="#fff" border-color="#6d6d6d">{{item.text}}</u-divider>
@@ -675,7 +677,7 @@
 		// 		width: 100%;
 		// 	}
 		// }
-		.oawork-textlong {
+		.oawork-textlong,.oawork-itemline {
 			.oawork-item1_a {
 				width: 100%;
 
@@ -698,10 +700,11 @@
 		}
 
 		/deep/.oawork-width49 {
-			padding: 4rpx 0px 4rpx 20rpx;
+			padding: 4rpx 0px 4rpx 10rpx;
 			width: 49%;
-
+			
 			.oawork-item1_a {
+				font-size: 28rpx;
 				min-width: 140rpx !important;
 			}
 		}

pages/oawork/business/list.vue

@@ -44,7 +44,7 @@
 		
 		
 		<view class="bottom">
-			<u-button type="primary"  @click="addInfo">公文提报</u-button>
+			<u-button type="primary"  @click="addInfo">表单提报</u-button>
 		</view>
 		
 	</view>
@@ -177,7 +177,7 @@
 						];
 					}
 				
-					this.recordsTotal = res.data.recordsTotal;
+					this.formData.recordsTotal = res.data.recordsTotal;
 				}).catch(error => {
 					uni.showToast({
 						title: error,

pages/oawork/data/oa1.js

@@ -8,30 +8,30 @@ var obj={
 			name:"故障现象"
 		}],
 		list:[
-			{
-				key:"",
-				type:["text","width49"],
-				view:1,
-				text:"姓名",
-				sql:["personInfo","name"],
-				viewSql:["formData","applyPersonName"]
-			},
-			{
-				key:"applyDate",
-				type:["text","width49"],
-				view:1,
-				text:"日期",
-				sql:["createTime"],
-				viewSql:["formData","createTime"]
-			},
-			{
-				key:"",
-				type:["text","width49"],
-				view:1,
-				text:"部门",
-				sql:["personInfo","orgName"],
-				viewSql:["orgName"]
-			},
+			// {
+			// 	key:"",
+			// 	type:["text","width49"],
+			// 	view:1,
+			// 	text:"姓名",
+			// 	sql:["personInfo","name"],
+			// 	viewSql:["formData","applyPersonName"]
+			// },
+			// {
+			// 	key:"applyDate",
+			// 	type:["text","width49"],
+			// 	view:1,
+			// 	text:"日期",
+			// 	sql:["createTime"],
+			// 	viewSql:["formData","createTime"]
+			// },
+			// {
+			// 	key:"",
+			// 	type:["text","width49"],
+			// 	view:1,
+			// 	text:"部门",
+			// 	sql:["personInfo","orgName"],
+			// 	viewSql:["orgName"]
+			// },
 			{
 				key:"deviceType",
 				type:["textlong"],

pages/oawork/data/oa10.js

@@ -1,7 +1,10 @@
 var obj={
 		key:"10",
 		title:"运输生产事项审批单",
-		
+		typeKey:[{
+			key:"matter",
+			name:"事项"
+		}],
 		url:"apply10",
 		list:[
 			
@@ -9,7 +12,7 @@ var obj={
 				key:"matter",
 				type:["text"],
 				text:"事项",	
-				//isrequset:1
+				isrequset:1
 			},
 			{
 				key:"content",

pages/oawork/data/oa2.js

@@ -36,6 +36,7 @@ var obj={
 				key:"title",
 				type:["text"],
 				text:"标题",
+				isrequset:1
 			},
 			
 			{

pages/oawork/data/oa3.js

@@ -15,6 +15,7 @@ var obj={
 				key:"name",
 				type:["text"],
 				text:"合同名称",
+				isrequset:1
 				
 			},
 			{
@@ -65,6 +66,7 @@ var obj={
 				type:["uview","divider","paddingTop"],
 				view:1,
 				text:"以下审批人可编辑",
+				role:["step1"]   ,
 				
 			},
 			{
@@ -72,13 +74,15 @@ var obj={
 				type:["text","title"],
 				view:1,
 				text:"合同承办部门意见",
+				role:["step1"]   ,
 				
 			},
 			{
 				key:"complianceOrNot",
 				type:["radio","itemrow"],
 				text:"合同业务是否合规",
-				role:["step1"]   // 0 申请人填写，1 全部可编辑，step0  审批人可审批,step1,  第一步可填写，
+				role:["step1"]   ,
+				// 0 申请人填写，1 全部可编辑，step0  审批人可审批,step1,  第一步可填写，
 			},
 			{
 				key:"passedOrNot",
@@ -109,6 +113,7 @@ var obj={
 				type:["uview","divider","paddingTop"],
 				view:1,
 				text:"",
+				role:["step1"]   ,
 				
 			},
 			{

pages/oawork/data/oa4.js

@@ -2,37 +2,21 @@ var obj={
 		key:"4",
 		title:"计算机维护申请单",
 		
-		url:"apply4",
+		url:"apply4",
+		typeKey:[{
+			key:"faultPhenomenon",
+			name:"故障现象"
+		}],
 		list:[
-			{
-				key:"name1",
-				type:["text","width49"],
-				view:1,
-				text:"姓名",
-				sql:["personInfo","name"],
-			},
-			{
-				key:"name2",
-				type:["text","width49"],
-				view:1,
-				text:"日期",
-				sql:["createTime"],
-			},
-			{
-				key:"name3",
-				type:["text","width49"],
-				view:1,
-				text:"部门",
-				sql:["personInfo","orgName"],
-			},
+			
 			{
 				key:"computeType",
-				type:["radio","textlong"],
+				type:["radio","itemline"],
 				text:"计算机类型",	
 				isrequset:1,
 				list:[
-					{value:"1",name:"台式机"},
-					{value:"0",name:"笔记本"}
+					{value:"0",name:"台式机"},
+					{value:"1",name:"笔记本"}
 				],
 			},
 			{
@@ -42,7 +26,7 @@ var obj={
 				isrequset:1
 			},
 			{
-				key:"name5",
+				key:"model",
 				type:["textlong"],
 				text:"设备型号",
 				
@@ -54,13 +38,13 @@ var obj={
 				isrequset:0
 			},
 			{
-				key:"name7",
+				key:"maintenanceDescription",
 				type:["textlong"],
 				text:"维护描述",
 				isrequset:0
 			},
 			{
-				key:"name8",
+				key:"amount",
 				type:["textnumber",'unit'],
 				text:"金额",
 				unit:"元"

pages/oawork/data/oa5.js

@@ -3,28 +3,11 @@ var obj={
 		title:"荆州市地方铁路有限公司申请单",
 		
 		url:"apply5",
+		typeKey:[{
+			key:"title",
+			name:"标题"
+		}],
 		list:[
-			{
-				key:"name1",
-				type:["text","width49"],
-				view:1,
-				text:"姓名",
-				sql:["personInfo","name"],
-			},
-			{
-				key:"name2",
-				type:["text","width49"],
-				view:1,
-				text:"日期",
-				sql:["createTime"],
-			},
-			{
-				key:"name3",
-				type:["text","width49"],
-				view:1,
-				text:"部门",
-				sql:["personInfo","orgName"],
-			},
 			
 			{
 				key:"title",

pages/oawork/data/oa6.js

@@ -2,13 +2,18 @@ var obj={
 		key:"6",
 		title:"收文处理专门笺",
 		
+		typeKey:[{
+			key:"receivingDocuments",
+			name:"收文"
+		}],
 		url:"apply6",
 		list:[
 			 
 			{
 				key:"receivingDocuments",
 				type:["text"],
-				text:"收文",		
+				text:"收文",	
+					isrequset:1
 			},
 			
 			{

pages/oawork/data/oa7.js

@@ -1,30 +1,20 @@
 var obj={
 		key:"7",
 		title:"外出登记单",
-		
+		typeKey:[
+			{
+				key:"travelDate",	name:"外出日期"
+			},
+			{
+			key:"reason",
+			name:"外出原因"
+		},{
+			key:"location",
+			name:"外出地点"
+		}],
 		url:"apply7",
 		list:[
-			{
-				key:"name1",
-				type:["text","width49"],
-				view:1,
-				text:"姓名",
-				sql:["personInfo","name"],
-			},
-			{
-				key:"name2",
-				type:["text","width49"],
-				view:1,
-				text:"日期",
-				sql:["createTime"],
-			},
-			{
-				key:"name3",
-				type:["text","width49"],
-				view:1,
-				text:"部门",
-				sql:["personInfo","orgName"],
-			},
+			
 			{
 				key:"reason",
 				type:["textlong"],
@@ -46,7 +36,7 @@ var obj={
 			{
 				key:"travelDate",
 				type:["selecttime"],
-				text:"日期",
+				text:"外出日期",
 				isrequset:1,
 				sql:["createTime"],
 			},

pages/oawork/data/oa8.js

@@ -1,7 +1,10 @@
 var obj={
 		key:"8",
 		title:"网络信息发布审查表",
-		
+		typeKey:[{
+			key:"title",
+			name:"标题"
+		}],
 		url:"apply8",
 		list:[
 			
@@ -9,7 +12,7 @@ var obj={
 				key:"title",
 				type:["text"],
 				text:"标题",	
-				isrequset:0
+				isrequset:1
 			},
 			{
 				key:"publishingUnit",
@@ -37,7 +40,7 @@ var obj={
 			},
 			
 			{
-				key:"name6",
+				key:"conferenceRemark",
 				type:["textlong"],
 				text:"发布时间及发布人",
 				isrequset:0

pages/oawork/data/oa9.js

@@ -2,29 +2,13 @@ var obj={
 		key:"9",
 		title:"用车申请",
 		url:"apply9",
-		
+		typeKey:[{
+			key:"reason",
+			name:"用车事由"
+		}],
 		list:[
-			{
-				key:"name1",
-				type:["text","width49"],
-				view:1,
-				text:"姓名",
-				sql:["personInfo","name"],
-			},
-			{
-				key:"name2",
-				type:["text","width49"],
-				view:1,
-				text:"日期",
-				sql:["createTime"],
-			},
-			{
-				key:"name3",
-				type:["text","width49"],
-				view:1,
-				text:"部门",
-				sql:["personInfo","orgName"],
-			},
+			
+			
 			{
 				key:"reason",
 				type:["textlong"],