内容调整

components/ApproveInfo.vue

@@ -1,5 +1,14 @@
 <template>
-	<view>
+	<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 class="businessMain" :style="'font-size:'+fieldInfo.fontsize+'rpx'">
 		
 		
@@ -72,7 +81,7 @@
 					<view class="oawork-item2">
 		
 						<template v-if="item.type.indexOf('textlong')>-1">
-							<u-input v-model="formData[item.key]"  :disabled="true"
+							<u-input v-model="formData[item.key]"  placeholder="" :disabled="true"
 								:placeholderStyle="placeholderStyle" class="oawork-line" type="textarea" />
 		
 						</template>
@@ -120,7 +129,7 @@
 			fieldInfo: {
 				immediate: true,
 				handler(val) {
-					console.log("fieldList",val)
+					//("fieldList",val)
 					if(val){
 						this.fieldList=val.list
 					}
@@ -163,12 +172,12 @@
 				}
 			},
 			getViewItem(item) {
-				console.log(item)
+				//(item)
 				if (item.viewSql) {
 					var obj = this;
 					for (var i in item.viewSql) {
 						var k = item.viewSql[i];
-						console.log(k)
+						//("viewSql",k,obj)
 						obj = obj[k]
 					}
 					return obj;
@@ -317,6 +326,15 @@
 			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;
+	}
 	//@import "../data/editor-icon.css";
 </style>

components/ApproveInfoEdit.vue

@@ -1,273 +1,273 @@
-<template>
-	<view>
-		<view class="businessMain" :style="'font-size:'+fieldInfo.fontsize+'rpx'">
-		
-		
-			<view class="businessTitle" v-if="false">{{fieldInfo.title}}</view>
-			<view v-for="(item,i) in fieldList" :key="i" 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>
-					</view>
-				</template>
-				<template v-else>
-		
-		
-					<view class="oawork-item1">
-						<view class="oawork-item1_a">{{item.text}}<span v-if="item.isrequset" style="color:red">*</span>
-						</view>
-						<view class="oawork-item1_b">
-							<template v-if="item.view">
-								{{formData[item.key]?formData[item.key]:getViewItem(item)}}
-							</template>
-							<template v-else>
-								<template v-if="item.type.indexOf('text')>-1">
-									<u-input v-model="formData[item.key]" :placeholder="'请输入'+item.text"
-										:placeholderStyle="placeholderStyle" class="oawork-line"
-										:customStyle="{textAlign: 'right'}" />
-										
-		
-								</template>
-								<template v-if="item.type.indexOf('textnumber')>-1">
-									<u-input v-model="formData[item.key]" type="number" :placeholder="'请输入'+item.text"
-										:placeholderStyle="placeholderStyle" class="oawork-line"
-										:customStyle="{textAlign: 'right'}" />
-		
-								</template>
-		
-								<template v-if="item.type.indexOf('radio')>-1">
-		
-									<u-radio-group v-model="formData[item.key]">
-										<u-radio v-for="(item, index) in item.list?item.list:radioListDefault"
-											:key="index" :name="item.value">
-											{{item.name}}
-										</u-radio>
-									</u-radio-group>
-		
-								</template>
-		
-		
-								<template v-if="item.type.indexOf('selecttime')>-1">
-		
-									<u-calendar max-date="2060-01-01" v-model="showCalendar" mode="date"
-										@change="changeCalendar"></u-calendar>
-									<view @click="showCalendar = true,keyCalendar=item">
-										{{formData[item.key]?formData[item.key]:getViewItem(item)}}</view>
-		
-								</template>
-								<template v-if="item.type.indexOf('selecttime2')>-1">
-		
-									<u-calendar max-date="2060-01-01" v-model="showCalendar" mode="range"
-										@change="changeCalendar2"></u-calendar>
-									<view @click="showCalendar = true,keyCalendar=item">
-										{{formData[item.key]?formData[item.key]:createTime}}至{{formData[item.key2]?formData[item.key2]:createTime}}
-									</view>
-		
-								</template>
-							</template>
-		
-		
-						</view>
-						<view class="oawork-item1_c" v-if="item.type.indexOf('unit')>-1">
-							{{item.unit}}
-						</view>
-					</view>
-		
-					<view class="oawork-item2">
-		
-						<template v-if="item.type.indexOf('textlong')>-1">
-							<u-input v-model="formData[item.key]" :placeholder="'请输入'+item.text"
-								:placeholderStyle="placeholderStyle" class="oawork-line" type="textarea" />
-		
-						</template>
-						<template v-if="item.type.indexOf('upload')>-1">
-							<view class="upload">
-		
-								<u-upload-file-all ref="uUpload"  :max-size="50 * 1024 * 1024"
-									:file-max-size="50 * 1024 * 1024" :maxCount="9" 
-									 :file-list="fileList"></u-upload-file-all>
-							</view>
-						</template>
-						<template v-if="item.type.indexOf('texteditor')>-1">
-							<view class="container">
-								<view class="page-body">
-									<view class='wrapper'>
-										<view class='toolbar' @tap="format" style="overflow-y: auto;">
-											<view :class="formats.bold ? 'ql-active' : ''"
-												class="iconfont icon-zitijiacu" data-name="bold"></view>
-											<view :class="formats.italic ? 'ql-active' : ''"
-												class="iconfont icon-zitixieti" data-name="italic"></view>
-											<view :class="formats.underline ? 'ql-active' : ''"
-												class="iconfont icon-zitixiahuaxian" data-name="underline"></view>
-											<view :class="formats.strike ? 'ql-active' : ''"
-												class="iconfont icon-zitishanchuxian" data-name="strike"></view>
-		
-											<view :class="formats.align === 'center' ? 'ql-active' : ''"
-												class="iconfont icon-juzhongduiqi" data-name="align"
-												data-value="center"></view>
-											<view :class="formats.align === 'right' ? 'ql-active' : ''"
-												class="iconfont icon-youduiqi" data-name="align" data-value="right">
-											</view>
-											<view :class="formats.align === 'justify' ? 'ql-active' : ''"
-												class="iconfont icon-zuoyouduiqi" data-name="align"
-												data-value="justify"></view>
-		
-		
-											<view class="iconfont icon-clearedformat" @tap="removeFormat"></view>
-		
-		
-											<view :class="formats.color === '#0000ff' ? 'ql-active' : ''"
-												class="iconfont icon-text_color" data-name="color" data-value="#0000ff">
-											</view>
-											<view :class="formats.backgroundColor === '#00ff00' ? 'ql-active' : ''"
-												class="iconfont icon-fontbgcolor" data-name="backgroundColor"
-												data-value="#00ff00"></view>
-											<view class="iconfont icon-date" @tap="insertDate"></view>
-											<view class="iconfont icon--checklist" data-name="list" data-value="check">
-											</view>
-											<view :class="formats.list === 'ordered' ? 'ql-active' : ''"
-												class="iconfont icon-youxupailie" data-name="list" data-value="ordered">
-											</view>
-											<view :class="formats.list === 'bullet' ? 'ql-active' : ''"
-												class="iconfont icon-wuxupailie" data-name="list" data-value="bullet">
-											</view>
-		
-											<view class="iconfont icon-undo" @tap="undo"></view>
-											<view class="iconfont icon-redo" @tap="redo"></view>
-		
-											<view class="iconfont icon-outdent" data-name="indent" data-value="-1">
-											</view>
-											<view class="iconfont icon-indent" data-name="indent" data-value="+1">
-											</view>
-											<view class="iconfont icon-fengexian" @tap="insertDivider"></view>
-											<view class="iconfont icon-charutupian" @tap="insertImage"></view>
-											<view :class="formats.header === 1 ? 'ql-active' : ''"
-												class="iconfont icon-format-header-1" data-name="header"
-												:data-value="1"></view>
-											<view :class="formats.script === 'sub' ? 'ql-active' : ''"
-												class="iconfont icon-zitixiabiao" data-name="script" data-value="sub">
-											</view>
-											<view :class="formats.script === 'super' ? 'ql-active' : ''"
-												class="iconfont icon-zitishangbiao" data-name="script"
-												data-value="super"></view>
-		
-											<view class="iconfont icon-shanchu" @tap="clear"></view>
-		
-											<view :class="formats.direction === 'rtl' ? 'ql-active' : ''"
-												class="iconfont icon-direction-rtl" data-name="direction"
-												data-value="rtl"></view>
-										</view>
-		
-										<view class="editor-wrapper">
-											<editor id="editor" class="ql-container" placeholder="开始输入..." show-img-size
-												show-img-toolbar show-img-resize @statuschange="onStatusChange"
-												:read-only="readOnly" @ready="onEditorReady">
-											</editor>
-										</view>
-									</view>
-								</view>
-							</view>
-						</template>
-		
-					</view>
-				</template>
-		
-			</view>
-			
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name:"ApproveInfo",
-		props:{
-			fieldInfo: {},
-			personInfo: {},
-			createTime: "",
-			createTime2: "",
+<template>
+	<view>
+		<view class="businessMain" :style="'font-size:'+fieldInfo.fontsize+'rpx'">
+		
+		
+			<view class="businessTitle" v-if="false">{{fieldInfo.title}}</view>
+			<view v-for="(item,i) in fieldList" :key="i" 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>
+					</view>
+				</template>
+				<template v-else>
+		
+		
+					<view class="oawork-item1">
+						<view class="oawork-item1_a">{{item.text}}<span v-if="item.isrequset" style="color:red">*</span>
+						</view>
+						<view class="oawork-item1_b">
+							<template v-if="item.view">
+								{{formData[item.key]?formData[item.key]:getViewItem(item)}}
+							</template>
+							<template v-else>
+								<template v-if="item.type.indexOf('text')>-1">
+									<u-input v-model="formData[item.key]" :placeholder="'请输入'+item.text"
+										:placeholderStyle="placeholderStyle" class="oawork-line"
+										:customStyle="{textAlign: 'right'}" />
+										
+		
+								</template>
+								<template v-if="item.type.indexOf('textnumber')>-1">
+									<u-input v-model="formData[item.key]" type="number" :placeholder="'请输入'+item.text"
+										:placeholderStyle="placeholderStyle" class="oawork-line"
+										:customStyle="{textAlign: 'right'}" />
+		
+								</template>
+		
+								<template v-if="item.type.indexOf('radio')>-1">
+		
+									<u-radio-group v-model="formData[item.key]">
+										<u-radio v-for="(item, index) in item.list?item.list:radioListDefault"
+											:key="index" :name="item.value">
+											{{item.name}}
+										</u-radio>
+									</u-radio-group>
+		
+								</template>
+		
+		
+								<template v-if="item.type.indexOf('selecttime')>-1">
+		
+									<u-calendar max-date="2060-01-01" v-model="showCalendar" mode="date"
+										@change="changeCalendar"></u-calendar>
+									<view @click="showCalendar = true,keyCalendar=item">
+										{{formData[item.key]?formData[item.key]:getViewItem(item)}}</view>
+		
+								</template>
+								<template v-if="item.type.indexOf('selecttime2')>-1">
+		
+									<u-calendar max-date="2060-01-01" v-model="showCalendar" mode="range"
+										@change="changeCalendar2"></u-calendar>
+									<view @click="showCalendar = true,keyCalendar=item">
+										{{formData[item.key]?formData[item.key]:createTime}}至{{formData[item.key2]?formData[item.key2]:createTime}}
+									</view>
+		
+								</template>
+							</template>
+		
+		
+						</view>
+						<view class="oawork-item1_c" v-if="item.type.indexOf('unit')>-1">
+							{{item.unit}}
+						</view>
+					</view>
+		
+					<view class="oawork-item2">
+		
+						<template v-if="item.type.indexOf('textlong')>-1">
+							<u-input v-model="formData[item.key]" :placeholder="'请输入'+item.text"
+								:placeholderStyle="placeholderStyle" class="oawork-line" type="textarea" />
+		
+						</template>
+						<template v-if="item.type.indexOf('upload')>-1">
+							<view class="upload">
+		
+								<u-upload-file-all ref="uUpload"  :max-size="50 * 1024 * 1024"
+									:file-max-size="50 * 1024 * 1024" :maxCount="9" 
+									 :file-list="fileList"></u-upload-file-all>
+							</view>
+						</template>
+						<template v-if="item.type.indexOf('texteditor')>-1">
+							<view class="container">
+								<view class="page-body">
+									<view class='wrapper'>
+										<view class='toolbar' @tap="format" style="overflow-y: auto;">
+											<view :class="formats.bold ? 'ql-active' : ''"
+												class="iconfont icon-zitijiacu" data-name="bold"></view>
+											<view :class="formats.italic ? 'ql-active' : ''"
+												class="iconfont icon-zitixieti" data-name="italic"></view>
+											<view :class="formats.underline ? 'ql-active' : ''"
+												class="iconfont icon-zitixiahuaxian" data-name="underline"></view>
+											<view :class="formats.strike ? 'ql-active' : ''"
+												class="iconfont icon-zitishanchuxian" data-name="strike"></view>
+		
+											<view :class="formats.align === 'center' ? 'ql-active' : ''"
+												class="iconfont icon-juzhongduiqi" data-name="align"
+												data-value="center"></view>
+											<view :class="formats.align === 'right' ? 'ql-active' : ''"
+												class="iconfont icon-youduiqi" data-name="align" data-value="right">
+											</view>
+											<view :class="formats.align === 'justify' ? 'ql-active' : ''"
+												class="iconfont icon-zuoyouduiqi" data-name="align"
+												data-value="justify"></view>
+		
+		
+											<view class="iconfont icon-clearedformat" @tap="removeFormat"></view>
+		
+		
+											<view :class="formats.color === '#0000ff' ? 'ql-active' : ''"
+												class="iconfont icon-text_color" data-name="color" data-value="#0000ff">
+											</view>
+											<view :class="formats.backgroundColor === '#00ff00' ? 'ql-active' : ''"
+												class="iconfont icon-fontbgcolor" data-name="backgroundColor"
+												data-value="#00ff00"></view>
+											<view class="iconfont icon-date" @tap="insertDate"></view>
+											<view class="iconfont icon--checklist" data-name="list" data-value="check">
+											</view>
+											<view :class="formats.list === 'ordered' ? 'ql-active' : ''"
+												class="iconfont icon-youxupailie" data-name="list" data-value="ordered">
+											</view>
+											<view :class="formats.list === 'bullet' ? 'ql-active' : ''"
+												class="iconfont icon-wuxupailie" data-name="list" data-value="bullet">
+											</view>
+		
+											<view class="iconfont icon-undo" @tap="undo"></view>
+											<view class="iconfont icon-redo" @tap="redo"></view>
+		
+											<view class="iconfont icon-outdent" data-name="indent" data-value="-1">
+											</view>
+											<view class="iconfont icon-indent" data-name="indent" data-value="+1">
+											</view>
+											<view class="iconfont icon-fengexian" @tap="insertDivider"></view>
+											<view class="iconfont icon-charutupian" @tap="insertImage"></view>
+											<view :class="formats.header === 1 ? 'ql-active' : ''"
+												class="iconfont icon-format-header-1" data-name="header"
+												:data-value="1"></view>
+											<view :class="formats.script === 'sub' ? 'ql-active' : ''"
+												class="iconfont icon-zitixiabiao" data-name="script" data-value="sub">
+											</view>
+											<view :class="formats.script === 'super' ? 'ql-active' : ''"
+												class="iconfont icon-zitishangbiao" data-name="script"
+												data-value="super"></view>
+		
+											<view class="iconfont icon-shanchu" @tap="clear"></view>
+		
+											<view :class="formats.direction === 'rtl' ? 'ql-active' : ''"
+												class="iconfont icon-direction-rtl" data-name="direction"
+												data-value="rtl"></view>
+										</view>
+		
+										<view class="editor-wrapper">
+											<editor id="editor" class="ql-container" placeholder="开始输入..." show-img-size
+												show-img-toolbar show-img-resize @statuschange="onStatusChange"
+												:read-only="readOnly" @ready="onEditorReady">
+											</editor>
+										</view>
+									</view>
+								</view>
+							</view>
+						</template>
+		
+					</view>
+				</template>
+		
+			</view>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"ApproveInfo",
+		props:{
+			fieldInfo: {},
+			personInfo: {},
+			createTime: "",
+			createTime2: "",
 			fileList:{
 				type: Array,
 				default () {
 					return [];
 				}
-			},
-			formData: {},
-			placeholderStyle: "font-size: 24rpx",
-		},
-		watch: {
-			fieldInfo: {
-				immediate: true,
-				handler(val) {
-					console.log("fieldList",val)
-					if(val){
-						this.fieldList=val.list
-					}
-					
-				}
-			},
-			// 监听lists的变化，发出事件
-			lists(n) {
-				this.$emit('on-list-change', n, this.index);
-			}
-		},
-		data() {
-			return {
-				fieldList: [],
-			};
-		},
-		created() {
-			//this.init()
-		},
-		methods:{
-			init() {
-			// 	this.personInfo = this.carhelp.getPersonInfo()
-			// 	this.createTime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
-			// 	this.createTime2 = parseUnixTime(currentTimeStamp());
-			
-				for (var i in this.fieldList) {
-					var obj = this.fieldList[i];
-					this.formData[obj.key] = ""
-				}
-			
-				//this.action = process.car.BASE_URL + "uploadPicture"
-			
-				//this.uploadData.subFolder = "oawork11" + this.oatype;
-				//接口应该免登陆
-				var token = this.carhelp.getToken()
-			
-				this.header = {
-					'Authorization': token
-				}
-			},
-			getViewItem(item) {
-				console.log(item)
-				if (item.viewSql) {
-					var obj = this;
-					for (var i in item.viewSql) {
-						var k = item.viewSql[i];
-						console.log(k)
-						obj = obj[k]
-					}
-					return obj;
-				}
-			},
-			getClass(item) {
-			
-				if (item) {
-					var list = item.type.map(it => {
-						return 'oawork-' + it
-					})
-					return list.join(' ')
-				}
-			
-			},
-		}
-		
-	}
-</script>
-
-<style  scoped lang="scss">
+			},
+			formData: {},
+			placeholderStyle: "font-size: 24rpx",
+		},
+		watch: {
+			fieldInfo: {
+				immediate: true,
+				handler(val) {
+					//("fieldList",val)
+					if(val){
+						this.fieldList=val.list
+					}
+					
+				}
+			},
+			// 监听lists的变化，发出事件
+			lists(n) {
+				this.$emit('on-list-change', n, this.index);
+			}
+		},
+		data() {
+			return {
+				fieldList: [],
+			};
+		},
+		created() {
+			//this.init()
+		},
+		methods:{
+			init() {
+			// 	this.personInfo = this.carhelp.getPersonInfo()
+			// 	this.createTime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
+			// 	this.createTime2 = parseUnixTime(currentTimeStamp());
+			
+				for (var i in this.fieldList) {
+					var obj = this.fieldList[i];
+					this.formData[obj.key] = ""
+				}
+			
+				//this.action = process.car.BASE_URL + "uploadPicture"
+			
+				//this.uploadData.subFolder = "oawork11" + this.oatype;
+				//接口应该免登陆
+				var token = this.carhelp.getToken()
+			
+				this.header = {
+					'Authorization': token
+				}
+			},
+			getViewItem(item) {
+				//(item)
+				if (item.viewSql) {
+					var obj = this;
+					for (var i in item.viewSql) {
+						var k = item.viewSql[i];
+						//(k)
+						obj = obj[k]
+					}
+					return obj;
+				}
+			},
+			getClass(item) {
+			
+				if (item) {
+					var list = item.type.map(it => {
+						return 'oawork-' + it
+					})
+					return list.join(' ')
+				}
+			
+			},
+		}
+		
+	}
+</script>
+
+<style  scoped lang="scss">
 .oawork-line {
 		border-bottom: 1px solid #c8c8c8;
 	}
@@ -396,5 +396,5 @@
 		}
 	}
 
-	//@import "../data/editor-icon.css";
+	//@import "../data/editor-icon.css";
 </style>

components/ApproveView.vue

@@ -7,7 +7,10 @@
 				<u-time-line-item node-top="10" v-for="(item,i) in activityList" :key="i">
 					<template v-slot:node>
 						<view>
-							<view class="u-node" style="background:#CDCDCD;">
+							<view class="u-node"  :class="{
+								viewc2:item.status==1,
+							
+							}">
 								<!-- 此处为uView的icon组件 -->
 								<!-- <u-icon name="checkmark" color="#fff" :size="24"></u-icon> -->
 							</view>
@@ -16,15 +19,18 @@
 					<template v-slot:content>
 						<view class="approveItem_main">
 							<view class="approveItem_a1">
-								<view class="approveItem_a1_text1">
-									{{item.activityName}}<span v-if="item.status==1" class="viewc">审核中</span>
+								<view class="approveItem_a1_text1"  :class="{
+								
+								viewc3:item.status==1
+								}" >
+									{{item.activityName}}
 								</view>
 								<view class="approveItem_a1_text2">
 									{{item.remark}}
 								</view>
 								<view class="approveItem_a1_text3">
 									<view class="approveItem_a1_text3Img" v-for="(it,j) in (item.wfProcinstActUserList)"
-										:key="i+'_'+j" :style="initStart&&it.type==1?'width: 100%;':''">
+										:key="i+'_'+j" :style="initStart&&it.type==1&&(item.action!=0||item.status==1)?'width: 100%;':''">
 		
 										<view  class="approveItem_a1_text3Img_item1" >
 											<view>
@@ -192,6 +198,7 @@
 	}
 	
 	.u-node {
+		
 		width: 18rpx;
 		height: 18rpx;
 		border-radius: 100rpx !important;
@@ -199,5 +206,16 @@
 		justify-content: center;
 		align-items: center;
 		background: #d0d0d0;
+	}
+	
+	
+	.viewc2{
+		width: 27rpx;
+		height: 27rpx;
+			background: #4CAF50;
+		
+	}
+	.viewc3{
+		color: #4CAF50  !important;
 	}
 </style>

components/ShareServer.vue

@@ -1,167 +1,167 @@
-<template>
-	<view></view>
-</template>
-
-<script>
-
-	import wx from 'weixin-js-sdk'
-	import * as API_WeiXin from '@/apis/weixin'
-
-	export default {
-		name: 'Share',
-		props: {
-			 
-		},
-		data() {
-			return {
-				id:'',
-				title:'',
-				url:'',
-				isLoading: false,
-				nowItem: {
-					shareTitle: '',
-					shareImg: '',
-					shareDescription: ''
-				}
-			}
-		},
-		created() {},
-		methods: {
-			 addPoint(){
-				 if(this.id){
-					 API_WeiXin.addPoint({
-					 					 id:this.id,
-					 					 pointCode:"70007"
-					 }).then(response => {
-					 		console.log("积分添加成功")
-							uni.showToast({
-								title: "分享成功",
-								icon: "none"
-							})
-									 
-					 })
-				 }
-				 
-			 },
-			
-			//获取微信jssdk配置信息
-			get_wx_config() {
-				
-				
-				API_WeiXin.getConfig(window.location.href.split("#")[0]).then(response => {
-					
-					
-					var wxconfig = response.data.wxConfig;
-					
-					console.log(wxconfig.nonceStr)
-					//this.wxConfig = wxconfig;
-				
-					wx.config({
-						debug: false, // 开启调试模式,
-						appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
-						timestamp: wxconfig.timestamp, // 必填，生成签名的时间戳
-						nonceStr: wxconfig.nonceStr, // 必填，生成签名的随机串
-						signature: wxconfig.signature, // 必填，签名，见附录1
-						jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage', 
-						'onMenuShareQQ', 'onMenuShareQZone'] ,// 必填，需要使用的JS接口列表，所有JS接口列表见附录2
-						//'checkJsApi',,'updateAppMessageShareData','updateTimelineShareData'
-					});
-					
-						console.log("aaa")
-					//this.wxShare()
-				}).catch(error => {
-					console.log(error)
-						console.log("errorerror")
-				})
-			},
-			setUrl(url){
-				this.url=process.car.IMG_URL+"railroad-phone/#"+url;
-			},
-			setTitle(text,id){
-				this.title=text;
-				this.id=id;
-				this.wxShare() 
-				
-			},
-			//微信分享自定义
-			wxShare() {
-				var userInfo=this.carhelp.getPersonInfo()
-				var img=process.car.IMG_URL+"railroad-phone/"+require("@/assets/img/logo.png")
-				
-				var title=this.title
-			//	var desc=
-				let joinUrl = this.url;
-				console.log(img);
-				console.log(title);
-				console.log(joinUrl);
-				var _this = this;
-				
-				wx.ready(function() {
-					
-					
-					// wx.updateTimelineShareData({
-					// 	title: title,
-					// //	desc:desc ,
-					// 	link: joinUrl,
-					// 	 imgUrl: img,
-					// 	success: function() {
-					// 		if(userInfo){
-					// 			//_this.addPoint()
-					// 		}
-					// 		// 设置成功
-					// 		_this.$emit("wxShare",null);
-					// 	}
-					// })
-					// wx.updateAppMessageShareData({
-					// 	title: title,
-					// //	desc:desc ,
-					// 	link: joinUrl,
-					// 	 imgUrl: img,
-					// 	success: function() {
-					// 		if(userInfo){
-					// 			//_this.addPoint()
-					// 		}
-					// 		// 设置成功
-					// 		_this.$emit("wxShare",null);
-					// 	}
-					// })
-					wx.onMenuShareAppMessage({
-						title: title,
-					 	desc:"[荆州市地方铁路有限公司微官网]" ,
-						link: joinUrl,
-						 imgUrl: img,
-						success: function() {
-							console.log('111')
-							if(userInfo){
-								_this.addPoint()
-							}
-							// 设置成功
-							_this.$emit("wxShare",null);
-						}
-					})
-					wx.onMenuShareTimeline({
-						title: title,
-						desc:"[荆州市地方铁路有限公司微官网]" ,
-						link: joinUrl,
-						 imgUrl: img,
-						success: function() {
-								console.log('222')
-							if(userInfo){
-								_this.addPoint()
-							}
-							// 设置成功
-							_this.$emit("wxShare",null);
-						}
-					})
-				});
-			}
-		},
-		mounted() {
-			this.url=window.location.href;
-			this.get_wx_config();
-		},
-	}
-</script>
-
-<style>
-</style>
+<template>
+	<view></view>
+</template>
+
+<script>
+
+	import wx from 'weixin-js-sdk'
+	import * as API_WeiXin from '@/apis/weixin'
+
+	export default {
+		name: 'Share',
+		props: {
+			 
+		},
+		data() {
+			return {
+				id:'',
+				title:'',
+				url:'',
+				isLoading: false,
+				nowItem: {
+					shareTitle: '',
+					shareImg: '',
+					shareDescription: ''
+				}
+			}
+		},
+		created() {},
+		methods: {
+			 addPoint(){
+				 if(this.id){
+					 API_WeiXin.addPoint({
+					 					 id:this.id,
+					 					 pointCode:"70007"
+					 }).then(response => {
+					 		//("积分添加成功")
+							uni.showToast({
+								title: "分享成功",
+								icon: "none"
+							})
+									 
+					 })
+				 }
+				 
+			 },
+			
+			//获取微信jssdk配置信息
+			get_wx_config() {
+				
+				
+				API_WeiXin.getConfig(window.location.href.split("#")[0]).then(response => {
+					
+					
+					var wxconfig = response.data.wxConfig;
+					
+					//(wxconfig.nonceStr)
+					//this.wxConfig = wxconfig;
+				
+					wx.config({
+						debug: false, // 开启调试模式,
+						appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
+						timestamp: wxconfig.timestamp, // 必填，生成签名的时间戳
+						nonceStr: wxconfig.nonceStr, // 必填，生成签名的随机串
+						signature: wxconfig.signature, // 必填，签名，见附录1
+						jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage', 
+						'onMenuShareQQ', 'onMenuShareQZone'] ,// 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+						//'checkJsApi',,'updateAppMessageShareData','updateTimelineShareData'
+					});
+					
+						//("aaa")
+					//this.wxShare()
+				}).catch(error => {
+					//(error)
+						//("errorerror")
+				})
+			},
+			setUrl(url){
+				this.url=process.car.IMG_URL+"railroad-phone/#"+url;
+			},
+			setTitle(text,id){
+				this.title=text;
+				this.id=id;
+				this.wxShare() 
+				
+			},
+			//微信分享自定义
+			wxShare() {
+				var userInfo=this.carhelp.getPersonInfo()
+				var img=process.car.IMG_URL+"railroad-phone/"+require("@/assets/img/logo.png")
+				
+				var title=this.title
+			//	var desc=
+				let joinUrl = this.url;
+				//(img);
+				//(title);
+				//(joinUrl);
+				var _this = this;
+				
+				wx.ready(function() {
+					
+					
+					// wx.updateTimelineShareData({
+					// 	title: title,
+					// //	desc:desc ,
+					// 	link: joinUrl,
+					// 	 imgUrl: img,
+					// 	success: function() {
+					// 		if(userInfo){
+					// 			//_this.addPoint()
+					// 		}
+					// 		// 设置成功
+					// 		_this.$emit("wxShare",null);
+					// 	}
+					// })
+					// wx.updateAppMessageShareData({
+					// 	title: title,
+					// //	desc:desc ,
+					// 	link: joinUrl,
+					// 	 imgUrl: img,
+					// 	success: function() {
+					// 		if(userInfo){
+					// 			//_this.addPoint()
+					// 		}
+					// 		// 设置成功
+					// 		_this.$emit("wxShare",null);
+					// 	}
+					// })
+					wx.onMenuShareAppMessage({
+						title: title,
+					 	desc:"[荆州市地方铁路有限公司微官网]" ,
+						link: joinUrl,
+						 imgUrl: img,
+						success: function() {
+							//('111')
+							if(userInfo){
+								_this.addPoint()
+							}
+							// 设置成功
+							_this.$emit("wxShare",null);
+						}
+					})
+					wx.onMenuShareTimeline({
+						title: title,
+						desc:"[荆州市地方铁路有限公司微官网]" ,
+						link: joinUrl,
+						 imgUrl: img,
+						success: function() {
+								//('222')
+							if(userInfo){
+								_this.addPoint()
+							}
+							// 设置成功
+							_this.$emit("wxShare",null);
+						}
+					})
+				});
+			}
+		},
+		mounted() {
+			this.url=window.location.href;
+			this.get_wx_config();
+		},
+	}
+</script>
+
+<style>
+</style>

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/',
 
 	
@@ -14,10 +14,10 @@ const UNI_APP = {
 	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 
 	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
 	openId:"oBEnI6GDWCRQqn_xlyPlCYFY8Amg",//zkx
-	//openId:"oBEnI6FVaHBZOgnxVa70ePPIBd68",//sz
+	openId:"oBEnI6FVaHBZOgnxVa70ePPIBd68",//sz
 	//
 	//openId:"oBEnI6DtjgbX65mL4_nUFtVgo-8Y",
-	openId:"oBEnI6PiaBMNUMTnjT0ffT1R2JOk",//杨所
+	//openId:"oBEnI6PiaBMNUMTnjT0ffT1R2JOk",//杨所
 	//openId:"oBEnI6N9gRq3xOVlw34JfYjhtB9k",//  伊明
 	
 	

main.js

@@ -89,7 +89,40 @@ Vue.mixin({
 
 	},
 	methods: {
-		
+		recordStatusColor(val){
+			var retu = ""
+			val=val+''
+			switch (val) {
+				case '-1':
+					retu = '#f29a38'
+					break;
+				case '0':
+					retu = '#f29a38'
+					break;
+				case '1':
+					retu = '#52b56b'
+					break;
+				case '2':
+					retu = '#c94031'
+					break;
+				case '3':
+					retu = '#3a3bc2'
+					break;
+				case '5':
+					retu = '#c94031'
+					break;
+				case '6':
+					retu = '#c94031'
+				case '9':
+					retu = '#c94031'
+					break;
+				default:
+					retu = '#52b56b'
+					break;
+			}
+		
+			return retu
+		},
 		substrDate(date){
 			if(date){
 				return date.substr(0,11)
@@ -117,6 +150,7 @@ Vue.mixin({
 			uni.navigateTo({
 				url: "/" + url
 			})
+		
 		}
 	}
 })

pages/homePage/homePage.vue

@@ -70,14 +70,15 @@
 					<view class="grid-text">为您服务</view>
 				</u-grid-item>
 				
-				<u-grid-item @click="gotoUrl('pages/videofile/index')">
+				<u-grid-item @click="gotoUrl('pages/videofile/index')" v-if="false" >
 					<img src="../../assets/img/video-file.svg"  alt="">
 					<view class="grid-text">职教在线</view>
 				</u-grid-item>
 				<u-grid-item  @click="gotoUrl('pages/oawork/index')" >
 					<img src="../../assets/img/handbag.png"  alt="">
 					<view class="grid-text">OA办公</view>
-				</u-grid-item>
+				</u-grid-item>
+				 
 				
 			</u-grid>
 		</view>
@@ -367,7 +368,8 @@
 	}
 
 	// 宫格
-	.grid {
+	.grid {
+		    background: #fff;
 		img {
 			width: 80rpx;
 			height: 80rpx;

pages/oawork/approve/info.vue

@@ -1,32 +1,32 @@
 <template>
 	<view>
-		<u-navbar :titleLong="fieldInfo.title">
-
+		<u-navbar title="详情审批">
+		
 		</u-navbar>
-		<approve-info  v-if="viewApproveBl"
-		:fieldInfo="fieldInfo" :formData="formData" :fileList="fileList" ></approve-info>
-		
-		<view class="submitBtn">
-			<u-button type="info" class="submitBtn30" @click="submit(0)">退回</u-button>
-			<u-button type="primary" class="submitBtn60" @click="submit(1)" >通过</u-button>
+		<approve-info  v-if="viewApproveBl"
+		:fieldInfo="fieldInfo" :formData="formData" :fileList="fileList" ></approve-info>
+		
+		<view class="submitBtn">
+			<u-button type="info" class="submitBtn30" @click="submit(0)">退回</u-button>
+			<u-button type="primary" class="submitBtn60" @click="submit(1)" >通过</u-button>
 		</view>
 		<approve-view  :activityList="activityList"></approve-view>
-			<u-popup  v-model="spPopup"  mode="bottom"
-			border-radius="14"
-			:closeable="true"  >
-				<view class="spPopupView" >
-					<view class="spPopupViewTitle" >{{sp?'确认通过':'确认退回'}}</view>
-					<view class="spPopupViewBtn" >
-						<u-input v-model="spText" type="textarea" height="300" :border="true" :auto-height="true" />
-					</view>
-					<view class=" submitBtn" >
-						<u-button type="info" class="submitBtn30" @click="spPopup=false">关闭</u-button>
-						
-						<u-button type="primary"   class="submitBtn60" @click="submitApi(sp)">{{sp?'确认通过':'确认退回'}}</u-button>
-					</view>
-				</view>
-				
-
+			<u-popup  v-model="spPopup"  mode="bottom"
+			border-radius="14"
+			:closeable="true"  >
+				<view class="spPopupView" >
+					<view class="spPopupViewTitle" >{{sp?'确认通过':'确认退回'}}</view>
+					<view class="spPopupViewBtn" >
+						<u-input v-model="spText" type="textarea" height="300" :border="true" :auto-height="true" />
+					</view>
+					<view class=" submitBtn" >
+						<u-button type="info" class="submitBtn30" @click="spPopup=false">关闭</u-button>
+						
+						<u-button type="primary"   class="submitBtn60" @click="submitApi(sp)">{{sp?'确认通过':'确认退回'}}</u-button>
+					</view>
+				</view>
+				
+
 			</u-popup>
 
 	</view>
@@ -37,8 +37,8 @@
 		dataJsGetInfo
 	} from '../data.js'
 	import * as API from '@/apis/pagejs/oa.js'
-	import approveView from '@/components/ApproveView.vue'
-	import approveInfo from '@/components/ApproveInfo.vue'
+	import approveView from '@/components/ApproveView.vue'
+	import approveInfo from '@/components/ApproveInfo.vue'
 	
 	import {
 
@@ -71,7 +71,7 @@
 					value: '0'
 				}, ],
 				fieldInfo: {},
-				fieldList: [],
+				fieldList: [],
 				formData: {},
 				activityList: [
 
@@ -85,13 +85,13 @@
 				fileList: [],
 				header: {
 
-				},
+				},
 				viewApproveBl:false,
 				id: "",
-				placeholder: '开始输入...',
-				sp:0,
-				spText:"",
-				spPopup:false,
+				placeholder: '开始输入...',
+				sp:0,
+				spText:"",
+				spPopup:false,
 				pid:"",
 
 			}
@@ -99,57 +99,57 @@
 		onLoad(op) {
 			this.oatype = op.oatype
 			if (op.id) {
-				this.id = op.id
+				this.id = op.id
 				
 			}
-			if (op.pid) {
-				
-				this.pid = op.pid
+			if (op.pid) {
+				
+				this.pid = op.pid
 			}
 			this.fieldInfo = dataJsGetInfo(op.oatype)
-			//console.log(this.fieldInfo)
+		
 			this.fieldList = this.fieldInfo.list;
 
 			this.getProcessDetails();
 
 		},
-		methods: {
-			
-			submitApi(sp) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.processNext({
-					 opinion:this.spText,
-					  action:this.sp,
-					procinstId: this.pid
-				}).then((res) => {
-					uni.hideLoading();
-					const eventChannel = this.getOpenerEventChannel();
-					eventChannel.emit('refreshData');
-					this.spPopup=false;
-					uni.showModal({
-						title:"提示",
-						showCancel:false,
-						content:"操作成功！",
-						success() {
-							uni.navigateBack()
-						}
-					})
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
+		methods: {
+			
+			submitApi(sp) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.processNext({
+					 opinion:this.spText,
+					  action:this.sp,
+					procinstId: this.pid
+				}).then((res) => {
+					uni.hideLoading();
+					const eventChannel = this.getOpenerEventChannel();
+					eventChannel.emit('refreshData');
+					this.spPopup=false;
+					uni.showModal({
+						title:"提示",
+						showCancel:false,
+						content:"操作成功！",
+						success() {
+							uni.navigateBack()
+						}
+					})
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			},
-			submit(sp) {
-				var _this=this;
+			submit(sp) {
+				var _this=this;
 				this.spPopup=true
-				this.sp=sp;
+				this.sp=sp;
 				this.spText=""
 			},
 			getProcessDetails() {
@@ -168,34 +168,38 @@
 					this.init()
 					if(applyContent){
 						this.formData.id=applyContent.id
-						for (var i in this.fieldList) {
-							var obj = this.fieldList[i];
-							//(this.formData[obj.key], applyContent[obj.key])
-							var data=applyContent[obj.key];
-							if(data==null){
-								continue
-							}
-							if (obj.type.indexOf("upload") > -1) {
-								if(data){
-									 
-									var sz=JSON.parse(data).map(str=>{
-										var item=JSON.parse(str)
-										return {
-											url:item.url,name:item.name,view:1
-										}
-									})
-									
-									this.fileList=sz//data.split(",").map(item=>{return {url:item,item.name=,view:1}})
-								}
-								
-							} 
-							this.formData[obj.key] = applyContent[obj.key]
-						
+						this.formData={
+							...applyContent,
+							...this.formData
+						}
+						for (var i in this.fieldList) {
+							var obj = this.fieldList[i];
+							//(this.formData[obj.key], applyContent[obj.key])
+							var data=applyContent[obj.key];
+							if(data==null){
+								continue
+							}
+							if (obj.type.indexOf("upload") > -1) {
+								if(data){
+									 
+									var sz=JSON.parse(data).map(str=>{
+										var item=JSON.parse(str)
+										return {
+											url:item.url,name:item.name,view:1
+										}
+									})
+									
+									this.fileList=sz//data.split(",").map(item=>{return {url:item,item.name=,view:1}})
+								}
+								
+							} 
+							this.formData[obj.key] = applyContent[obj.key]
+						
 						}
 					}
 					this.viewApproveBl=true
 
-					console.log(this.formData)
+					//(this.formData)
 				}).catch(error => {
 					uni.showToast({
 						title: error,
@@ -241,7 +245,7 @@
 				}
 			},
 			getViewItem(item) {
-				console.log(item)
+				//(item)
 				if (item.sql) {
 					var obj = this;
 					for (var i in item.sql) {
@@ -288,7 +292,7 @@
 					value
 				} = e.target.dataset
 				if (!name) return
-				// console.log('format', name, value)
+				// //('format', name, value)
 				this.editorCtx.format(name, value)
 			},
 			onStatusChange(e) {
@@ -298,7 +302,7 @@
 			insertDivider() {
 				this.editorCtx.insertDivider({
 					success: function() {
-						console.log('insert divider success')
+						//('insert divider success')
 					}
 				})
 			},
@@ -310,7 +314,7 @@
 						if (res.confirm) {
 							this.editorCtx.clear({
 								success: function(res) {
-									console.log("clear success")
+									//("clear success")
 								}
 							})
 						}
@@ -335,7 +339,7 @@
 							src: res.tempFilePaths[0],
 							alt: '图像',
 							success: function() {
-								console.log('insert image success')
+								//('insert image success')
 							}
 						})
 					}
@@ -475,19 +479,19 @@
 			width: 60%;
 		}
 	}
-	.spPopupView{
-		//margin-top: 20px;
-		padding: 8px;
-		.spPopupViewTitle{
-			padding-bottom: 3px;
-			color: rgba(16, 16, 16, 1);
-			font-size: 20px;
-			text-align: center;
-			padding: 8px;
-		}
-		.spPopupViewBtn{
-			padding-bottom: 60px
-		}
+	.spPopupView{
+		//margin-top: 20px;
+		padding: 8px;
+		.spPopupViewTitle{
+			padding-bottom: 3px;
+			color: rgba(16, 16, 16, 1);
+			font-size: 20px;
+			text-align: center;
+			padding: 8px;
+		}
+		.spPopupViewBtn{
+			padding-bottom: 60px
+		}
 	}
 	@import "../data/editor-icon.css";
 </style>

pages/oawork/approve/list.vue

@@ -1,10 +1,10 @@
 <template>
 	<view>
-		<u-navbar title="公文审批">
+		<u-navbar :title="title">
 			
 		</u-navbar>
 		
-		<u-tabs :list="tabslist" :is-scroll="false" :current="current" @change="change"></u-tabs>
+		<u-tabs :list="tabslist" v-if="showTabs" :is-scroll="false" :current="current" @change="change"></u-tabs>
 		
 		<view class="list1">
 			<view class="item" v-for="(item,i) in list" @click="ckInfo(item)" :key="i">
@@ -81,14 +81,23 @@
 					name:"已处理",
 					current:1,
 				},],
-					current:0,
+					current:0,
+					title:"列表",
 				list: [
 					
-				],
+				],
+				showTabs:true
 			}
 		},
 		onLoad(op){
-			this.oatype=op.oatype;
+			this.oatype=op.oatype;
+			if(op.oaname){
+				this.title=op.oaname;
+			}
+			 if(this.oatype=="view"){
+				 this.showTabs=false
+			 }
+			
 			this.getList();
 		},
 		onReachBottom() {
@@ -108,6 +117,9 @@
 					url="/pages/oawork/approve/info"
 				}else{
 					url="/pages/oawork/approve/view"
+				}
+				if(this.oatype=="view"){
+					url="/pages/oawork/approve/view"
 				}
 				uni.navigateTo({
 					url:url+"?id="+info.businessKey+"&oatype="+info.type+"&pid="+info.id,
@@ -125,47 +137,17 @@
 							this.getList();
 							
 			},
-			recordStatusColor(val){
-				var retu = ""
-				val=val+''
-				switch (val) {
-					case '-1':
-						retu = '#f29a38'
-						break;
-					case '0':
-						retu = '#f29a38'
-						break;
-					case '1':
-						retu = '#52b56b'
-						break;
-					case '2':
-						retu = '#c94031'
-						break;
-					case '3':
-						retu = '#3a3bc2'
-						break;
-					case '5':
-						retu = '#c94031'
-						break;
-					case '6':
-						retu = '#c94031'
-					case '9':
-						retu = '#c94031'
-						break;
-					default:
-						retu = '#52b56b'
-						break;
-				}
 			
-				return retu
-			},
 			getList(){
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
 				})
 				//this.formData.formId=this.oatype
-				this.formData.status=this.tabslist[this.current].current
+				this.formData.status=this.tabslist[this.current].current
+				if(this.oatype=="view"){
+					this.formData.status=2
+				}
 				API.approveList(this.formData).then((res) => {
 					
 					uni.hideLoading();

pages/oawork/approve/view.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
-		<u-navbar :titleLong="fieldInfo.title">
-
+		<u-navbar title="详情查看">
+		
 		</u-navbar>
 		<approve-info  v-if="viewApproveBl"
 		:fieldInfo="fieldInfo" :formData="formData"   :fileList="fileList" ></approve-info>
@@ -84,7 +84,7 @@
 			}
 
 			this.fieldInfo = dataJsGetInfo(op.oatype)
-			//console.log(this.fieldInfo)
+			////(this.fieldInfo)
 			this.fieldList = this.fieldInfo.list;
 
 			this.getProcessDetails();
@@ -110,6 +110,11 @@
 					this.init()
 					if(applyContent){
 						this.formData.id=applyContent.id
+						this.formData={
+							...applyContent,
+							...this.formData
+						}
+						
 						for (var i in this.fieldList) {
 							var obj = this.fieldList[i];
 							//(this.formData[obj.key], applyContent[obj.key])
@@ -137,7 +142,7 @@
 					}
 					this.viewApproveBl=true
 
-					console.log(this.formData)
+					//(this.formData)
 				}).catch(error => {
 					uni.showToast({
 						title: error,
@@ -183,7 +188,7 @@
 				}
 			},
 			getViewItem(item) {
-				console.log(item)
+				//(item)
 				if (item.sql) {
 					var obj = this;
 					for (var i in item.sql) {
@@ -230,7 +235,7 @@
 					value
 				} = e.target.dataset
 				if (!name) return
-				// console.log('format', name, value)
+				// //('format', name, value)
 				this.editorCtx.format(name, value)
 			},
 			onStatusChange(e) {
@@ -240,7 +245,7 @@
 			insertDivider() {
 				this.editorCtx.insertDivider({
 					success: function() {
-						console.log('insert divider success')
+						//('insert divider success')
 					}
 				})
 			},
@@ -252,7 +257,7 @@
 						if (res.confirm) {
 							this.editorCtx.clear({
 								success: function(res) {
-									console.log("clear success")
+									//("clear success")
 								}
 							})
 						}
@@ -277,7 +282,7 @@
 							src: res.tempFilePaths[0],
 							alt: '图像',
 							success: function() {
-								console.log('insert image success')
+								//('insert image success')
 							}
 						})
 					}

pages/oawork/business/add.vue

@@ -253,7 +253,7 @@
 			}
 
 			this.fieldInfo = dataJsGetInfo(op.oatype)
-			//(this.fieldInfo)
+			
 			this.fieldList = this.fieldInfo.list;
 
 			this.getProcessDetails();
@@ -272,7 +272,7 @@
 				for(var i in  this.fieldList){
 					var item=this.fieldList[i]
 					if(item.isrequset){
-						console.log(item)
+						//(item)
 						var key=this.formData[item.key]
 						if(!key){
 								uni.showToast({
@@ -346,7 +346,7 @@
 					title: "加载中",
 					mask: true,
 				})
-
+				
 				API.processDetails({
 					formId: this.oatype,
 					id: this.id
@@ -383,7 +383,7 @@
 						}
 					}
 					
-					console.log(this.formData)
+					//(this.formData)
 					////(this.formData.maintenanceDescription,res.data.applyContent.maintenanceDescription)
 				}).catch(error => {
 					uni.showToast({

pages/oawork/business/info.vue

@@ -1,8 +1,9 @@
 <template>
 	<view>
-		<u-navbar :titleLong="fieldInfo.title">
+		<u-navbar title="详情查看">
 
 		</u-navbar>
+	
 		<approve-info  v-if="viewApproveBl"
 		:fieldInfo="fieldInfo" :formData="formData"  :fileList="fileList" ></approve-info>
 		
@@ -84,7 +85,7 @@
 			}
 
 			this.fieldInfo = dataJsGetInfo(op.oatype)
-			//console.log(this.fieldInfo)
+		
 			this.fieldList = this.fieldInfo.list;
 
 			this.getProcessDetails();
@@ -109,7 +110,10 @@
 					var applyContent = res.data.applyContent
 					this.init()
 					if(applyContent){
-						this.formData.id=applyContent.id
+						this.formData={
+							...applyContent,
+							...this.formData
+						}
 						for (var i in this.fieldList) {
 							var obj = this.fieldList[i];
 							//(this.formData[obj.key], applyContent[obj.key])
@@ -137,7 +141,7 @@
 					}
 					this.viewApproveBl=true
 
-					console.log(this.formData)
+					//("formData",this.formData)
 				}).catch(error => {
 					uni.showToast({
 						title: error,
@@ -183,7 +187,7 @@
 				}
 			},
 			getViewItem(item) {
-				console.log(item)
+				//(item)
 				if (item.sql) {
 					var obj = this;
 					for (var i in item.sql) {
@@ -230,7 +234,7 @@
 					value
 				} = e.target.dataset
 				if (!name) return
-				// console.log('format', name, value)
+				// //('format', name, value)
 				this.editorCtx.format(name, value)
 			},
 			onStatusChange(e) {
@@ -240,7 +244,7 @@
 			insertDivider() {
 				this.editorCtx.insertDivider({
 					success: function() {
-						console.log('insert divider success')
+						//('insert divider success')
 					}
 				})
 			},
@@ -252,7 +256,7 @@
 						if (res.confirm) {
 							this.editorCtx.clear({
 								success: function(res) {
-									console.log("clear success")
+									//("clear success")
 								}
 							})
 						}
@@ -277,7 +281,7 @@
 							src: res.tempFilePaths[0],
 							alt: '图像',
 							success: function() {
-								console.log('insert image success')
+								//('insert image success')
 							}
 						})
 					}
@@ -417,6 +421,14 @@
 			width: 60%;
 		}
 	}
-
+	.head-approve{
+		    padding: 2px 8px;
+		    background: #ffffff;
+		    margin-bottom: 8px;
+			display: flex;
+		    flex-wrap: wrap;
+		    justify-content: space-between;
+			    font-size: 32px;
+	}
 	@import "../data/editor-icon.css";
 </style>

pages/oawork/business/select.vue

@@ -9,7 +9,7 @@
 			<view class="vongi-bread">
 				<template v-for="(item,index) in navList">
 					<a :class="navCanClick(item,index)?'color4fc5f7':''" @click="reloadItem(item,index)" :key="index"
-						v-text="item.name"></a>
+						v-text="item.name"></a>
 						<u-icon name="arrow-right" :key="index" v-if="index!=navList.length-1"></u-icon>
 					
 				</template>
@@ -22,8 +22,8 @@
 						{{item.name}}
 					</view>
 
-					<a href="" class=" mui-ellipsis-a " @click="reloadNext(item)">
-						<img src="@/assets/img/oawork/select.png">
+					<a href="" class=" mui-ellipsis-a " @click="reloadNext(item)">
+						<img src="@/assets/img/oawork/select.png">
 						下级</a>
 					<!--灰色状态-->
 					<!--<a href="" class="color999 iconfont icon-xiaji">下级</a>-->
@@ -51,14 +51,14 @@
 						<input name="checkbox1" :value="item.id" v-model="selectId" type="checkbox"> -->
 					</view>
 				</view>
-				<view class=" vongi-footer " >
+				<view class=" vongi-footer " >
 					
 					<view class="margin10">已选择人员：<span style="float: right;">已选{{selectPerson.length}}人</span></view>
 					<view class="vongi-yjbtn flew" :style="'height:'+clientHeight+'px'">
 						<span style="height: 24px;" v-for="(item,i) in selectPerson" :key="i">{{item.auditorName}}
 							<a class="iconfont icon-guanbi1" v-show="item.status==0"
-								@click="checkboxBtn(item)">
-								<u-icon name="close"></u-icon>
+								@click="checkboxBtn(item)">
+								<u-icon name="close"></u-icon>
 								</a></span>
 
 					</view>
@@ -105,8 +105,8 @@
 			checkboxBtn(obj) {
 
 				//selectId.push(item.id)
-				console.log(this.selectId)
-				console.log(this.selectPerson)
+				//(this.selectId)
+				//(this.selectPerson)
 				if (this.selectId.includes(obj.personId)) {
 
 					var i = -1;
@@ -149,7 +149,7 @@
 					} else {
 						this.clientHeight = 500;
 					}
-					console.log(top)
+					//(top)
 				})
 			},
 			reloadItem(item, index) {
@@ -692,7 +692,7 @@
 					}
 
 					this.setHeight()
-					console.log(this.selectPerson)
+					//(this.selectPerson)
 				}
 			},
 		}
@@ -714,90 +714,90 @@
 		top: 50%;
 		right: 32rpx;
 		transform: translateY(-50%);
-	}
-	.vongi-bread{
-		font-size: 14px;
- padding: 10px;
-		    display: -webkit-box;
-		    overflow-x: scroll;
-		   
-			.color4fc5f7{
-				    color: #3385FF/*蓝*/;
-			}
-			a{
-				    padding: 0 5px;
-				    display: block;
-			}
-	}
-	.mui-table-view{
-		background-color: rgba(255, 255, 255, 1);
-		.mui-table-view-cell {
-			display: flex;
-			     padding: 11px 15px;
-			    justify-content: space-between;
-				.mui-ellipsis{
-					    flex: 1;
-					    border-right: 1px solid #BBBBBB;
-					    padding-right: 15px;
-					    margin-right: 15px;
-				}
-				.mui-ellipsis-a{
-					    color: #3385FF;
-						img{
-							width: 24rpx;
-							height: 24rpx;
-						}
-				}
-		}
-
-	}
-	.vongi-fplist{
-		.mui-content-padded{
-			font-size: 14px;
-			padding: 10px;
-		}
-		.mui-input-group{
-			background-color: rgba(255, 255, 255, 1);
-			.mui-input-row{
-				padding: 10px;
-			}
-		}
-		
-	}
-	.vongi-footer{
-		    position: fixed;
-		    bottom: 0;
-		    width: 100%;
-		    padding: 10px 0;
-			background-color: #f3f4f4;
-			.margin10,.vongi-yjbtn{
-				 padding: 0px 20px;
-				background-color: rgba(255, 255, 255, 1);
-			}
-			.vongi-yjbtn{
-				    display: flex;
-				    flex-wrap: wrap;
-				  
-				    height: 112px;
-				    overflow-y: scroll;
-					    width: 100%;
-				span{
-					color: #3385FF;
-					    border: 1px solid #3385FF;
-					    border-radius: 18px;
-					    padding: 2px 10px;
-					       display: flex;
-					       align-items: center;
-					    margin: 5px;
-				}
-				a{
-					    font-size: 14px;
-					    margin-left: 5px;
-					    color: #3385FF;
-				}
-			}
-	}
-	.selectcheckboxBtn{
-		    color: #3385FF;
+	}
+	.vongi-bread{
+		font-size: 14px;
+ padding: 10px;
+		    display: -webkit-box;
+		    overflow-x: scroll;
+		   
+			.color4fc5f7{
+				    color: #3385FF/*蓝*/;
+			}
+			a{
+				    padding: 0 5px;
+				    display: block;
+			}
+	}
+	.mui-table-view{
+		background-color: rgba(255, 255, 255, 1);
+		.mui-table-view-cell {
+			display: flex;
+			     padding: 11px 15px;
+			    justify-content: space-between;
+				.mui-ellipsis{
+					    flex: 1;
+					    border-right: 1px solid #BBBBBB;
+					    padding-right: 15px;
+					    margin-right: 15px;
+				}
+				.mui-ellipsis-a{
+					    color: #3385FF;
+						img{
+							width: 24rpx;
+							height: 24rpx;
+						}
+				}
+		}
+
+	}
+	.vongi-fplist{
+		.mui-content-padded{
+			font-size: 14px;
+			padding: 10px;
+		}
+		.mui-input-group{
+			background-color: rgba(255, 255, 255, 1);
+			.mui-input-row{
+				padding: 10px;
+			}
+		}
+		
+	}
+	.vongi-footer{
+		    position: fixed;
+		    bottom: 0;
+		    width: 100%;
+		    padding: 10px 0;
+			background-color: #f3f4f4;
+			.margin10,.vongi-yjbtn{
+				 padding: 0px 20px;
+				background-color: rgba(255, 255, 255, 1);
+			}
+			.vongi-yjbtn{
+				    display: flex;
+				    flex-wrap: wrap;
+				  
+				    height: 112px;
+				    overflow-y: scroll;
+					    width: 100%;
+				span{
+					color: #3385FF;
+					    border: 1px solid #3385FF;
+					    border-radius: 18px;
+					    padding: 2px 10px;
+					       display: flex;
+					       align-items: center;
+					    margin: 5px;
+				}
+				a{
+					    font-size: 14px;
+					    margin-left: 5px;
+					    color: #3385FF;
+				}
+			}
+	}
+	.selectcheckboxBtn{
+		    color: #3385FF;
 	}
 </style>

pages/oawork/data/oa1.js

@@ -14,7 +14,7 @@ var obj={
 				view:1,
 				text:"姓名",
 				sql:["personInfo","name"],
-				viewSql:["applyPersonName"]
+				viewSql:["formData","applyPersonName"]
 			},
 			{
 				key:"applyDate",

pages/oawork/data/oa2.js

@@ -5,23 +5,23 @@ var obj={
 		url:"apply2",
 		list:[
 			{
-				key:"name1",
+				key:"fileNumber",
 				type:["text","width49"],
 				text:"文件编号",		
 			},
 			{
-				key:"name2",
+				key:"printing",
 				type:["text","width49"],
 				text:"印数",		
 			},
 			{
-				key:"name3",
+				key:"draftedBy",
 				type:["text","width49"],
 				text:"拟稿人",		
 			},
 			
 			{
-				key:"name4",
+				key:"proofreader",
 				type:["text","width49"],
 				text:"核对人",	
 				
@@ -29,13 +29,13 @@ var obj={
 			
 			
 			{
-				key:"name5",
+				key:"title",
 				type:["text"],
 				text:"标题",
 			},
 			
 			{
-				key:"name6",
+				key:"themeWord",
 				type:["texteditor"],
 				text:"主题词",
 				

pages/oawork/data1.vue

@@ -1,339 +1,339 @@
-<template>
-	<view>
-		<u-navbar title="数据明细">
-		</u-navbar>
-		<u-calendar v-model="show" mode="date" @change="change2"></u-calendar>
-
-		<view class="mainHead">
-			<view class="headO headOindex" @click="btnHead(-1)">
-				<u-icon name="arrow-left" size="20"></u-icon>
-			</view>
-			<view  @click="show = true">
-				{{time}}<u-icon  style="margin-left: 6px;" name="arrow-down"></u-icon>
-			</view>
-			<view class="headO"  @click="btnHead(1)" :class="{
-				headOindex:nowtime!=time
-			}" >
-				<u-icon name="arrow-right" size="20" ></u-icon>
-			</view>
-		</view>
-		
-		<view class="mainBody">
-			<u-tabs :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
-			<view class="table">
-				
-				<view class="tableHead"  :style="'top:'+top">
-					<table>
-						<tr :style="data1style1" >
-							<td :style="data1style2">
-								单位
-							</td>
-						</tr>
-						<tr v-for="(item,i) in  list[current].list" :key="i" :style="item.data1style1" >
-							<td  >
-								{{item.a}}
-							</td>
-						</tr>
-					</table>
-				
-				</view>
-				<view class="tableBody">
-					<scroll-view  class="scroll-view_H"  scroll-x="true" style="white-space: nowrap;">
-						<table>
-							<tr class="tabbleHeadTr">
-								<td rowspan="3" class="get_td_top" >
-									单位
-								</td>
-								<td  rowspan="3">
-									本月完成
-								</td>
-								<td  rowspan="3">
-									累计完成
-								</td>
-								<td  rowspan="3">
-									同期
-								</td>
-								<td  rowspan="3">
-									增幅
-								</td>
-								<td  rowspan="1" colspan="12">
-									其中
-								</td>
-							</tr>
-							<tr class="tabbleHeadTr">
-								<td colspan="2">
-									增值税
-								</td>
-								<td  rowspan="2" >
-									增幅
-								</td><td  colspan="2">
-									企业所得税
-								</td><td  rowspan="2">
-									增幅
-								</td><td  colspan="2">
-									个人所得税
-								</td><td  rowspan="2">
-									增幅
-								</td><td  colspan="2">
-									城建税
-								</td><td  rowspan="2">
-									增幅
-								</td>
-							</tr>
-							
-							<tr class="tabbleHeadTr">
-								<td >
-									本年
-								</td>
-								<td >
-									上年
-								</td>
-								
-								<td >
-									本年
-								</td>
-								<td >
-									上年
-								</td>
-								
-								<td >
-									本年
-								</td>
-								<td >
-									上年
-								</td>
-								
-								<td >
-									本年
-								</td>
-								<td >
-									上年
-								</td>
-							</tr>
-							
-							<tr v-for="(item,i) in  list[current].list" :key="i" class="tabbleBodyTr">
-								<td :class="'get_td get_td_i_'+i">
-									{{item.a}}
-								</td>
-								<td >
-									{{item.b}}
-								</td>
-								<td >
-									{{item.c}}
-								</td>
-								<td >
-									{{item.d}}
-								</td>
-							</tr>
-						</table>
-					</scroll-view>
-					
-				</view>
-				
-			</view>
-			
-			 
-		</view>
-		
-		
-		
-	</view>
-</template>
-
-<script>
-	import {
-		newDate,
-		currentTimeStamp,
-		parseUnixTime,
-		afterTimeStamp,
-	} from '@/apis/utils'
-	
-	export default {
-		data() {
-			return {
-				nowtime:"",
-				show:false,
-				time:"",
-				data1style:"",
-				 top: '0px',
-				current:0,
-				list:[{
-					name:"车务段",
-					list:[
-						{a:"223223223223223223223223223223223223223223",b:"222222222222",c:"223",d:"qwe223"},
-						{a:"123",b:"223",c:"223",d:"tda223tda223tda223tda223tda223tda223tda223tda223"}
-					]
-				},{
-					name:"机务段"
-				},
-				
-				
-				]
-			}
-		},
-		onLoad(){
-			this.nowtime=parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
-			
-			this.time=parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
-		},
-		onReady() {
-			const query = uni.createSelectorQuery().in(this);
-			query.select('.tableBody').boundingClientRect(data => {
-			  //console.log("得到布局位置信息" + JSON.stringify(data));
-			 // console.log("节点离页面顶部的距离为" + data.top);
-			  this.top=data.top+"px"
-			}).exec();
-			
-			query.select('.get_td_top').boundingClientRect(data => {
-			  console.log(".get_td得到布局位置信息" + JSON.stringify(data));
-				this.data1style1="height:"+data.height+"px"
-				this.data1style2="width:"+(data.width-2)+"px;text-align: center;"
-				
-			}).exec();
-			
-			query.selectAll('.get_td').boundingClientRect(data => {
-			  //console.log(".get_td得到布局位置信息" + JSON.stringify(data));
-			  //console.log(".get_td节点离页面顶部的距离为" + data.top);
-			  for(var i in  data){
-				  var style="width:"+data[i].width+"px;height:"+data[i].height+"px"
-				  this.list[this.current].list[i].data1style1=style
-			  }
-			
-			}).exec();
-		},
-		methods: {
-			btnHead(a){
-					if(a>0){
-						if(this.nowtime==this.time){
-							return
-						}else{
-							
-						}
-					}else{
-						
-					}
-					this.time=parseUnixTime(afterTimeStamp(a,newDate(this.time)), '{y}-{m}-{d}');
-					
-			},
-			
-			change2(e) {
-							this.time=e.result;
-						},
-			change(index) {
-							this.current = index;
-						}
-		}
-	}
-</script>
-
-<style   lang="scss" scoped  >
-	.headO{
-		color:#D4D6D9 ;
-		border: 1px solid #D4D6D9 ;
-		border-radius: 58px;
-		width: 20px;
-		height: 20px;
-		    display: flex;
-		    align-items: center;
-		    justify-content: center;
-	}
-	.headOindex{
-		color:#1677FF  ;
-		border: 1px solid #1677FF  ;
-	}
-	.mainHead{
-		background-color: rgba(255, 255, 255, 1);
-		margin: 12px 16px;
-		border-radius: 8px;
-		    display: flex;
-		    justify-content: space-around;
-			padding: 14px 0;
-	}
-	.scroll-Y {
-		height: 300rpx;
-	}
-	
-	.scroll-view_H {
-		white-space: nowrap;
-		width: 100%;
-	}
-	
-	.scroll-view-item {
-		height: 300rpx;
-		line-height: 300rpx;
-		text-align: center;
-		font-size: 36rpx;
-	}
-	
-	.scroll-view-item_H {
-		display: inline-block;
-		//width: 85%;
-		height: 300rpx;
-		line-height: 300rpx;
-		text-align: center;
-		font-size: 36rpx;
-	}
-	
-	
-	.table{
-		 //   display: flex;
-		table{
-			border-top: 1px solid #dbdbdb;
-			border-spacing:0;
-			td{
-				border-right: 1px solid #dbdbdb;
-				border-bottom: 1px solid #dbdbdb;
-				line-height: 20px;
-				background-color: rgba(255, 255, 255, 1);
-				
-				max-width: 140px;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				white-space: pre-line;
-				padding :0 3px;
-				
-			}
-			.tabbleHeadTr td{
-				width: 80px;
-				min-width: 80px;
-				
-				text-align: center;
-				//height: 60px;
-				
-				//color: rgba(255, 255, 255, 1);
-				
-			}
-			.tabbleBodyTr td{
-				height: 60px;
-				
-			
-			}
-		}
-	}
-	.tableHead{
-		position: relative;
-		    position: absolute;
-		   
-		    z-index: 99;
-	}
-	.mainBody{
-		.mainItem{
-			color: rgba(16, 16, 16, 1);
-			font-size: 32rpx;
-			line-height: 20px;
-			border-radius: 8px;
-			background-color: rgba(255, 255, 255, 1);
-			margin: 16px;
-			padding: 12px 16px;
-			
-			.name{
-				
-			}
-			
-			.left{
-				
-			}
-		}
-	}
-</style>
+<template>
+	<view>
+		<u-navbar title="数据明细">
+		</u-navbar>
+		<u-calendar v-model="show" mode="date" @change="change2"></u-calendar>
+
+		<view class="mainHead">
+			<view class="headO headOindex" @click="btnHead(-1)">
+				<u-icon name="arrow-left" size="20"></u-icon>
+			</view>
+			<view  @click="show = true">
+				{{time}}<u-icon  style="margin-left: 6px;" name="arrow-down"></u-icon>
+			</view>
+			<view class="headO"  @click="btnHead(1)" :class="{
+				headOindex:nowtime!=time
+			}" >
+				<u-icon name="arrow-right" size="20" ></u-icon>
+			</view>
+		</view>
+		
+		<view class="mainBody">
+			<u-tabs :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+			<view class="table">
+				
+				<view class="tableHead"  :style="'top:'+top">
+					<table>
+						<tr :style="data1style1" >
+							<td :style="data1style2">
+								单位
+							</td>
+						</tr>
+						<tr v-for="(item,i) in  list[current].list" :key="i" :style="item.data1style1" >
+							<td  >
+								{{item.a}}
+							</td>
+						</tr>
+					</table>
+				
+				</view>
+				<view class="tableBody">
+					<scroll-view  class="scroll-view_H"  scroll-x="true" style="white-space: nowrap;">
+						<table>
+							<tr class="tabbleHeadTr">
+								<td rowspan="3" class="get_td_top" >
+									单位
+								</td>
+								<td  rowspan="3">
+									本月完成
+								</td>
+								<td  rowspan="3">
+									累计完成
+								</td>
+								<td  rowspan="3">
+									同期
+								</td>
+								<td  rowspan="3">
+									增幅
+								</td>
+								<td  rowspan="1" colspan="12">
+									其中
+								</td>
+							</tr>
+							<tr class="tabbleHeadTr">
+								<td colspan="2">
+									增值税
+								</td>
+								<td  rowspan="2" >
+									增幅
+								</td><td  colspan="2">
+									企业所得税
+								</td><td  rowspan="2">
+									增幅
+								</td><td  colspan="2">
+									个人所得税
+								</td><td  rowspan="2">
+									增幅
+								</td><td  colspan="2">
+									城建税
+								</td><td  rowspan="2">
+									增幅
+								</td>
+							</tr>
+							
+							<tr class="tabbleHeadTr">
+								<td >
+									本年
+								</td>
+								<td >
+									上年
+								</td>
+								
+								<td >
+									本年
+								</td>
+								<td >
+									上年
+								</td>
+								
+								<td >
+									本年
+								</td>
+								<td >
+									上年
+								</td>
+								
+								<td >
+									本年
+								</td>
+								<td >
+									上年
+								</td>
+							</tr>
+							
+							<tr v-for="(item,i) in  list[current].list" :key="i" class="tabbleBodyTr">
+								<td :class="'get_td get_td_i_'+i">
+									{{item.a}}
+								</td>
+								<td >
+									{{item.b}}
+								</td>
+								<td >
+									{{item.c}}
+								</td>
+								<td >
+									{{item.d}}
+								</td>
+							</tr>
+						</table>
+					</scroll-view>
+					
+				</view>
+				
+			</view>
+			
+			 
+		</view>
+		
+		
+		
+	</view>
+</template>
+
+<script>
+	import {
+		newDate,
+		currentTimeStamp,
+		parseUnixTime,
+		afterTimeStamp,
+	} from '@/apis/utils'
+	
+	export default {
+		data() {
+			return {
+				nowtime:"",
+				show:false,
+				time:"",
+				data1style:"",
+				 top: '0px',
+				current:0,
+				list:[{
+					name:"车务段",
+					list:[
+						{a:"223223223223223223223223223223223223223223",b:"222222222222",c:"223",d:"qwe223"},
+						{a:"123",b:"223",c:"223",d:"tda223tda223tda223tda223tda223tda223tda223tda223"}
+					]
+				},{
+					name:"机务段"
+				},
+				
+				
+				]
+			}
+		},
+		onLoad(){
+			this.nowtime=parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
+			
+			this.time=parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
+		},
+		onReady() {
+			const query = uni.createSelectorQuery().in(this);
+			query.select('.tableBody').boundingClientRect(data => {
+			  ("得到布局位置信息" + JSON.stringify(data));
+			 // //("节点离页面顶部的距离为" + data.top);
+			  this.top=data.top+"px"
+			}).exec();
+			
+			query.select('.get_td_top').boundingClientRect(data => {
+			  //(".get_td得到布局位置信息" + JSON.stringify(data));
+				this.data1style1="height:"+data.height+"px"
+				this.data1style2="width:"+(data.width-2)+"px;text-align: center;"
+				
+			}).exec();
+			
+			query.selectAll('.get_td').boundingClientRect(data => {
+			  (".get_td得到布局位置信息" + JSON.stringify(data));
+			  (".get_td节点离页面顶部的距离为" + data.top);
+			  for(var i in  data){
+				  var style="width:"+data[i].width+"px;height:"+data[i].height+"px"
+				  this.list[this.current].list[i].data1style1=style
+			  }
+			
+			}).exec();
+		},
+		methods: {
+			btnHead(a){
+					if(a>0){
+						if(this.nowtime==this.time){
+							return
+						}else{
+							
+						}
+					}else{
+						
+					}
+					this.time=parseUnixTime(afterTimeStamp(a,newDate(this.time)), '{y}-{m}-{d}');
+					
+			},
+			
+			change2(e) {
+							this.time=e.result;
+						},
+			change(index) {
+							this.current = index;
+						}
+		}
+	}
+</script>
+
+<style   lang="scss" scoped  >
+	.headO{
+		color:#D4D6D9 ;
+		border: 1px solid #D4D6D9 ;
+		border-radius: 58px;
+		width: 20px;
+		height: 20px;
+		    display: flex;
+		    align-items: center;
+		    justify-content: center;
+	}
+	.headOindex{
+		color:#1677FF  ;
+		border: 1px solid #1677FF  ;
+	}
+	.mainHead{
+		background-color: rgba(255, 255, 255, 1);
+		margin: 12px 16px;
+		border-radius: 8px;
+		    display: flex;
+		    justify-content: space-around;
+			padding: 14px 0;
+	}
+	.scroll-Y {
+		height: 300rpx;
+	}
+	
+	.scroll-view_H {
+		white-space: nowrap;
+		width: 100%;
+	}
+	
+	.scroll-view-item {
+		height: 300rpx;
+		line-height: 300rpx;
+		text-align: center;
+		font-size: 36rpx;
+	}
+	
+	.scroll-view-item_H {
+		display: inline-block;
+		//width: 85%;
+		height: 300rpx;
+		line-height: 300rpx;
+		text-align: center;
+		font-size: 36rpx;
+	}
+	
+	
+	.table{
+		 //   display: flex;
+		table{
+			border-top: 1px solid #dbdbdb;
+			border-spacing:0;
+			td{
+				border-right: 1px solid #dbdbdb;
+				border-bottom: 1px solid #dbdbdb;
+				line-height: 20px;
+				background-color: rgba(255, 255, 255, 1);
+				
+				max-width: 140px;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				white-space: pre-line;
+				padding :0 3px;
+				
+			}
+			.tabbleHeadTr td{
+				width: 80px;
+				min-width: 80px;
+				
+				text-align: center;
+				//height: 60px;
+				
+				//color: rgba(255, 255, 255, 1);
+				
+			}
+			.tabbleBodyTr td{
+				height: 60px;
+				
+			
+			}
+		}
+	}
+	.tableHead{
+		position: relative;
+		    position: absolute;
+		   
+		    z-index: 99;
+	}
+	.mainBody{
+		.mainItem{
+			color: rgba(16, 16, 16, 1);
+			font-size: 32rpx;
+			line-height: 20px;
+			border-radius: 8px;
+			background-color: rgba(255, 255, 255, 1);
+			margin: 16px;
+			padding: 12px 16px;
+			
+			.name{
+				
+			}
+			
+			.left{
+				
+			}
+		}
+	}
+</style>

pages/oawork/index.vue

@@ -4,11 +4,12 @@
 			
 		</u-navbar>
 		<view class="mainBody">
-			<view class="mainItem" v-for="(info,i) in  list" :key="i" >
+			<view class="mainItem" v-for="(info,i) in  list" :key="i" v-if="info.show" >
 				<view class="name">{{info.name}}</view>
 				<view class="grid">
 					<u-grid :col="3" :border="false">
-						<u-grid-item   v-for="(item,index) in info.list" :key="index"   	@click="gotoItem(info,item)" >
+						<u-grid-item   v-for="(item,index) in info.list" :key="index"   v-if="item.show"
+							@click="gotoItem(info,item)" >
 							<view class="gridItem" :style="item.bgColor?item.bgColor:info.bgColor">
 								<img :src="item.img?item.img:info.img" alt="">
 								
@@ -40,19 +41,22 @@
 			return {
 				list:[
 					{
-						name:"公文提报",
+						name:"公文提报",
+							show:1,
 						img:img1,
 						url:"/pages/oawork/business/list",
 						bgColor:"background: linear-gradient(90deg, rgba(82,222,216,1) 0%,rgba(89,196,196,1) 50%,rgba(22,164,167,1) 100%);",
 						list:[
 							{
 								name:"发文申请",
-								type:"2",
+								type:"2",
+								show:1
 							
 							},
 							{
 								name:"合同审核表",
-								type:"3"
+								type:"3",
+								show:1
 							},
 							{
 								name:"收文处理专门笺",
@@ -61,7 +65,8 @@
 						],
 					},
 					{
-						name:"申请提交",
+						name:"申请提交",
+							show:1,
 						img:img2,
 						url:"/pages/oawork/business/list",
 						bgColor:"background-color: rgba(0, 185, 98, 1);",
@@ -74,11 +79,13 @@
 							},
 							{
 								name:"计算机维护",
-								type:"4"
+								type:"4",
+								show:1
 							},
 							{
 								name:"公司申请单",
-								type:"5"
+								type:"5",
+								show:1
 							},
 							{
 								name:"外出登记单",
@@ -99,7 +106,8 @@
 						],
 					},
 					{
-						name:"代办审批",
+						name:"代办审批",
+							show:1,
 						url:"/pages/oawork/approve/list",
 						img:img3,
 						bgColor:"background-color: rgba(22, 119, 255, 1);",
@@ -107,12 +115,14 @@
 						list:[
 							{
 								name:"公文审批",
-								type:"oa1"
+								type:"approve",
+									show:1
 							}
-							//, {
-							// 	name:"公文类型1",
-							// 	type:"oa2"
-							// },
+							, {
+								name:"查看抄送",
+								type:"view",
+									show:1
+							},
 							// {
 							// 	name:"公文类型1",
 							// 	type:"oa3"
@@ -150,7 +160,7 @@
 		methods: {
 			gotoItem(info,item){
 				uni.navigateTo({
-					url:(item.url?item.url:info.url)+"?oatype="+item.type
+					url:(item.url?item.url:info.url)+"?oatype="+item.type+"&oaname="+item.name
 				})
 			}
 		}