添加pdf在线预览和通讯录树形结构展示

jp-mobile/common/util.js

@@ -1,12 +1,96 @@
-
 /**
  * base64加密
  */
-var Base64 = { 
-	_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
-	encode:function(e){
-		var t="";var n,r,i,s,o,u,a;var f=0;e=Base64._utf8_encode(e);while(f<e.length){n=e.charCodeAt(f++);r=e.charCodeAt(f++);i=e.charCodeAt(f++);s=n>>2;o=(n&3)<<4|r>>4;u=(r&15)<<2|i>>6;a=i&63;if(isNaN(r)){u=a=64}else if(isNaN(i)){a=64}t=t+this._keyStr.charAt(s)+this._keyStr.charAt(o)+this._keyStr.charAt(u)+this._keyStr.charAt(a)}return t},decode:function(e){var t="";var n,r,i;var s,o,u,a;var f=0;e=e.replace(/[^A-Za-z0-9+/=]/g,"");while(f<e.length){s=this._keyStr.indexOf(e.charAt(f++));o=this._keyStr.indexOf(e.charAt(f++));u=this._keyStr.indexOf(e.charAt(f++));a=this._keyStr.indexOf(e.charAt(f++));n=s<<2|o>>4;r=(o&15)<<4|u>>2;i=(u&3)<<6|a;t=t+String.fromCharCode(n);if(u!=64){t=t+String.fromCharCode(r)}if(a!=64){t=t+String.fromCharCode(i)}}t=Base64._utf8_decode(t);return t},_utf8_encode:function(e){e=e.replace(/rn/g,"n");var t="";for(var n=0;n<e.length;n++){var r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r)}else if(r>127&&r<2048){t+=String.fromCharCode(r>>6|192);t+=String.fromCharCode(r&63|128)}else{t+=String.fromCharCode(r>>12|224);t+=String.fromCharCode(r>>6&63|128);t+=String.fromCharCode(r&63|128)}}return t},_utf8_decode:function(e){var t="";var n=0;var r=c1=c2=0;while(n<e.length){r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r);n++}else if(r>191&&r<224){c2=e.charCodeAt(n+1);t+=String.fromCharCode((r&31)<<6|c2&63);n+=2}else{c2=e.charCodeAt(n+1);c3=e.charCodeAt(n+2);t+=String.fromCharCode((r&15)<<12|(c2&63)<<6|c3&63);n+=3}}return t
-		},
+var Base64 = {
+	_keyStr: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
+	encode: function(e) {
+		var t = "";
+		var n, r, i, s, o, u, a;
+		var f = 0;
+		e = Base64._utf8_encode(e);
+		while (f < e.length) {
+			n = e.charCodeAt(f++);
+			r = e.charCodeAt(f++);
+			i = e.charCodeAt(f++);
+			s = n >> 2;
+			o = (n & 3) << 4 | r >> 4;
+			u = (r & 15) << 2 | i >> 6;
+			a = i & 63;
+			if (isNaN(r)) {
+				u = a = 64
+			} else if (isNaN(i)) {
+				a = 64
+			}
+			t = t + this._keyStr.charAt(s) + this._keyStr.charAt(o) + this._keyStr.charAt(u) + this._keyStr
+				.charAt(a)
+		}
+		return t
+	},
+	decode: function(e) {
+		var t = "";
+		var n, r, i;
+		var s, o, u, a;
+		var f = 0;
+		e = e.replace(/[^A-Za-z0-9+/=]/g, "");
+		while (f < e.length) {
+			s = this._keyStr.indexOf(e.charAt(f++));
+			o = this._keyStr.indexOf(e.charAt(f++));
+			u = this._keyStr.indexOf(e.charAt(f++));
+			a = this._keyStr.indexOf(e.charAt(f++));
+			n = s << 2 | o >> 4;
+			r = (o & 15) << 4 | u >> 2;
+			i = (u & 3) << 6 | a;
+			t = t + String.fromCharCode(n);
+			if (u != 64) {
+				t = t + String.fromCharCode(r)
+			}
+			if (a != 64) {
+				t = t + String.fromCharCode(i)
+			}
+		}
+		t = Base64._utf8_decode(t);
+		return t
+	},
+	_utf8_encode: function(e) {
+		e = e.replace(/rn/g, "n");
+		var t = "";
+		for (var n = 0; n < e.length; n++) {
+			var r = e.charCodeAt(n);
+			if (r < 128) {
+				t += String.fromCharCode(r)
+			} else if (r > 127 && r < 2048) {
+				t += String.fromCharCode(r >> 6 | 192);
+				t += String.fromCharCode(r & 63 | 128)
+			} else {
+				t += String.fromCharCode(r >> 12 | 224);
+				t += String.fromCharCode(r >> 6 & 63 | 128);
+				t += String.fromCharCode(r & 63 | 128)
+			}
+		}
+		return t
+	},
+	_utf8_decode: function(e) {
+		var t = "";
+		var n = 0;
+		var r = c1 = c2 = 0;
+		while (n < e.length) {
+			r = e.charCodeAt(n);
+			if (r < 128) {
+				t += String.fromCharCode(r);
+				n++
+			} else if (r > 191 && r < 224) {
+				c2 = e.charCodeAt(n + 1);
+				t += String.fromCharCode((r & 31) << 6 | c2 & 63);
+				n += 2
+			} else {
+				c2 = e.charCodeAt(n + 1);
+				c3 = e.charCodeAt(n + 2);
+				t += String.fromCharCode((r & 15) << 12 | (c2 & 63) << 6 | c3 & 63);
+				n += 3
+			}
+		}
+		return t
+	},
 }
 
 /**
@@ -15,31 +99,35 @@ var Base64 = {
  * 目标对象不存在但是源对象存在的属性， 全部丢弃；
  * 目标对象存在但是源对象不存在的属性，如果是字符串赋值为空串，其余类型赋值为undefined
  */
-function recover (target, source) {
-  if (target === undefined || target === null) { throw new TypeError('Cannot convert first argument to object') }
-  var to = Object(target)
-  if (source === undefined || source === null) { return to }
-  var keysArray = Object.keys(Object(target))
-  for (var nextIndex = 0, len = keysArray.length; nextIndex < len; nextIndex++) {
-    var nextKey = keysArray[nextIndex]
-    var desc = Object.getOwnPropertyDescriptor(target, nextKey)
-    if (desc !== undefined && desc.enumerable) {
-      if (to.hasOwnProperty(nextKey)) {
-        if (to[nextKey] instanceof Array) {
-          to[nextKey] = source[nextKey]
-        } else if (to[nextKey] instanceof Object) {
-          recover(to[nextKey], source[nextKey])
-        } else if (source[nextKey] !== undefined) {
-          to[nextKey] = source[nextKey]
-        } else if (typeof (to[nextKey]) === 'string') {
-          to[nextKey] = ''
-        } else {
-          to[nextKey] = undefined
-        }
-      }
-    }
-  }
-  return to
+function recover(target, source) {
+	if (target === undefined || target === null) {
+		throw new TypeError('Cannot convert first argument to object')
+	}
+	var to = Object(target)
+	if (source === undefined || source === null) {
+		return to
+	}
+	var keysArray = Object.keys(Object(target))
+	for (var nextIndex = 0, len = keysArray.length; nextIndex < len; nextIndex++) {
+		var nextKey = keysArray[nextIndex]
+		var desc = Object.getOwnPropertyDescriptor(target, nextKey)
+		if (desc !== undefined && desc.enumerable) {
+			if (to.hasOwnProperty(nextKey)) {
+				if (to[nextKey] instanceof Array) {
+					to[nextKey] = source[nextKey]
+				} else if (to[nextKey] instanceof Object) {
+					recover(to[nextKey], source[nextKey])
+				} else if (source[nextKey] !== undefined) {
+					to[nextKey] = source[nextKey]
+				} else if (typeof(to[nextKey]) === 'string') {
+					to[nextKey] = ''
+				} else {
+					to[nextKey] = undefined
+				}
+			}
+		}
+	}
+	return to
 }
 
 /**
@@ -48,47 +136,51 @@ function recover (target, source) {
  * 目标对象不存在但是源对象存在的属性， 全部丢弃；
  * 目标对象存在但是源对象不存在的属性，保留目标对象的属性不做处理
  */
-function recoverNotNull (target, source) {
-  if (target === undefined || target === null) { throw new TypeError('Cannot convert first argument to object') }
-  var to = Object(target)
-  if (source === undefined || source === null) { return to }
-  var keysArray = Object.keys(Object(target))
-  for (var nextIndex = 0, len = keysArray.length; nextIndex < len; nextIndex++) {
-    var nextKey = keysArray[nextIndex]
-    var desc = Object.getOwnPropertyDescriptor(target, nextKey)
-    if (desc !== undefined && desc.enumerable) {
-      if (to.hasOwnProperty(nextKey)) {
-        if (to[nextKey] instanceof Array) {
-          to[nextKey] = source[nextKey]
-        } else if (to[nextKey] instanceof Object) {
-          recover(to[nextKey], source[nextKey])
-        } else if (source[nextKey] !== undefined) {
-          to[nextKey] = source[nextKey]
-        }
-      }
-    }
-  }
-  return to
+function recoverNotNull(target, source) {
+	if (target === undefined || target === null) {
+		throw new TypeError('Cannot convert first argument to object')
+	}
+	var to = Object(target)
+	if (source === undefined || source === null) {
+		return to
+	}
+	var keysArray = Object.keys(Object(target))
+	for (var nextIndex = 0, len = keysArray.length; nextIndex < len; nextIndex++) {
+		var nextKey = keysArray[nextIndex]
+		var desc = Object.getOwnPropertyDescriptor(target, nextKey)
+		if (desc !== undefined && desc.enumerable) {
+			if (to.hasOwnProperty(nextKey)) {
+				if (to[nextKey] instanceof Array) {
+					to[nextKey] = source[nextKey]
+				} else if (to[nextKey] instanceof Object) {
+					recover(to[nextKey], source[nextKey])
+				} else if (source[nextKey] !== undefined) {
+					to[nextKey] = source[nextKey]
+				}
+			}
+		}
+	}
+	return to
 }
 
 // 驼峰转下划线
-function toLine (name) {
-  if (name.indexOf('.') < 0) {
-    return name.replace(/([A-Z])/g, '_$1').toLowerCase()
-  } else {
-    return name
-  }
+function toLine(name) {
+	if (name.indexOf('.') < 0) {
+		return name.replace(/([A-Z])/g, '_$1').toLowerCase()
+	} else {
+		return name
+	}
 }
 // 使用正则表达式判断文件名或URL是否为图片格式
 function isImageFormat(filename) {
-  const imageFormats = /\.(jpeg|jpg|gif|png|bmp|svg)$/i;
-  return imageFormats.test(filename);
+	const imageFormats = /\.(jpeg|jpg|gif|png|bmp|svg)$/i;
+	return imageFormats.test(filename);
 }
 
 module.exports = {
-	Base64:Base64,
+	Base64: Base64,
 	recover: recover,
 	recoverNotNull: recoverNotNull,
 	toLine: toLine,
-	isImageFormat:isImageFormat
-}
+	isImageFormat: isImageFormat,
+}

jp-mobile/components/jp-datetime-picker/jp-datetime-picker.vue

@@ -29,7 +29,7 @@
 		data () {
 			return {
 				show: false,
-				value1: '',
+				value1: Number(new Date()),
 				label: ''
 			}
 		},

jp-mobile/components/ly-tree/ly-tree.vue

@@ -514,7 +514,7 @@
 		background: #FFF;
 		color: #606266;
 		padding: 30rpx;
-		max-height: 600rpx;
+		max-height: 90vh;
 		overflow-y: scroll;
 	}
 	

jp-mobile/pages.json

@@ -43,6 +43,12 @@
 				"navigationBarTitleText": "公文统计"
 			}
 		},
+		{
+		    "path" : "pages/pdfPreview/pdfPreview",
+		    "style" : {
+				"navigationBarTitleText": "预览"
+			}
+		},
 		{
 			"path": "pages/user/setting/password/password",
 			"style": {

jp-mobile/pages/addressbook/addressbook.vue

@@ -1,29 +1,34 @@
 <template>
-<view>
-	<cu-custom bgColor="bg-blue">
-		<block slot="content">通讯录</block>
-	</cu-custom>
+	<view>
+		<cu-custom bgColor="bg-blue">
+			<block slot="content">通讯录</block>
+		</cu-custom>
 
-	<u-sticky>
-		<view  style="padding: 20upx; background-color: white;">
-			<u-search placeholder="输入搜索的关键词" :clearabled="true" :showAction="false" v-model="searchUserName"></u-search>
+		<!-- <u-sticky>
+			<view style="padding: 20upx; background-color: white;">
+				<u-search placeholder="输入搜索的关键词" :clearabled="true" :showAction="false"
+					v-model="searchUserName"></u-search>
+			</view>
+		</u-sticky> -->
+		<view class="tree">
+			<ly-tree :tree-data="officeList" :props="props" node-key="id" :checkOnClickNode="true" :showRadio="false"
+				:show-checkbox="false" :checkOnlyLeaf="false" ref="officeTree" />
 		</view>
-	</u-sticky>
-	
-	<view>
+
+		<!--<view>
 		<u-index-list :indexList="indexList">
 			<template v-for="(item, index) in list">
-				<!-- #ifdef APP-NVUE -->
+				 #ifdef APP-NVUE 
 				<u-index-anchor :text="list[index].letter" :key="index"></u-index-anchor>
-				<!-- #endif -->
+				<!-- #endif 
 				<u-index-item :key="index">
 					<!-- #ifndef APP-NVUE -->
-					<u-index-anchor :text="list[index].letter"></u-index-anchor>
-					<!-- #endif -->
+		<!-- <u-index-anchor :text="list[index].letter"></u-index-anchor> -->
+		<!-- #endif 
 					<view class="list" v-for="(user, index1) in list[index].data" :key="index1">
 						<view class="list__item">
 							<u-avatar shape="square" size="35" icon="account-fill" fontSize="26" randomBgColor></u-avatar>
-							<!-- <view class="cu-avatar round " :style="'background-image:url('+(user.photo?user.photo:'/h5/static/user/flat-avatar.png')+');'"></view> -->
+							<!-- <view class="cu-avatar round " :style="'background-image:url('+(user.photo?user.photo:'/h5/static/user/flat-avatar.png')+');'"></view> 
 							<text class="list__item__user-name">{{user.name}}</text>
 						</view>
 						<u-line></u-line>
@@ -33,92 +38,131 @@
 			<view style="font-size: 15px; color: gray; text-align: center; margin-top: 15px;">共{{total}}位好友</view>
 		</u-index-list>
 		<u-gap height="100" bgColor="#fff"></u-gap>
+	</view>-->
 	</view>
-</view>	
 </template>
 
 <script>
 	import userService from '@/api/sys/userService'
+	import officeService from "@/api/sys/officeService"
 	export default {
 		data() {
 			return {
 				indexList: [],
+				officeList: [],
 				userList: [],
 				total: 0,
 				searchUserName: ''
 			}
 		},
+		props: {
+			props: {
+				type: Object,
+				default: () => {
+					return {
+						children: 'children',
+						label: 'name'
+					}
+				}
+			}
+		},
 		created() {
-			userService.list({current: 1, size: 10000}).then((data)=>{
+			officeService.treeData().then(data => {
+				this.officeList = data
+				this.forItem(this.officeList)
+			})
+			userService.list({
+				current: 1,
+				size: 10000
+			}).then((data) => {
 				this.userList = data.records
 				this.total = data.total
-			}).catch((e)=>{
+			}).catch((e) => {
 				throw e
 			})
 		},
-		computed: {
-			list () {
-				let resultList = this.userList.filter((item)=>{
-					if(item.name.indexOf(this.searchUserName) >= 0){
-						return true
-					}
-				})
-				return this.pySegSort(resultList)
-			}
-		},
+		// computed: {
+		// 	list () {
+		// 		let resultList = this.userList.filter((item)=>{
+		// 			if(item.name.indexOf(this.searchUserName) >= 0){
+		// 				return true
+		// 			}
+		// 		})
+		// 		return this.pySegSort(resultList)
+		// 	}
+		// },
 		methods: {
 			// 排序
 			pySegSort(arr) {
-			    if(!String.prototype.localeCompare)
-			        return null;
-			     
-			    var letters = "0abcdefghjklmnopqrstwxyz".split('');
-			    var zh = "阿八嚓哒妸发旮哈讥咔垃痳拏噢妑七呥扨它穵夕丫帀".split('');
-			     
-			    var segs = [];
-			    var curr;
-			    letters.forEach((item,i) => {
-			        curr = {letter: item, data:[]};
-			        arr.forEach((item2) => {
-			            if((!zh[i-1] || zh[i-1].localeCompare(item2.name) <= 0) && item2.name.localeCompare(zh[i]) == -1) {
-			                curr.data.push(item2);
-			            }
-			        });
-			        if(curr.data.length) {
-			            segs.push(curr);
+				if (!String.prototype.localeCompare)
+					return null;
+
+				var letters = "0abcdefghjklmnopqrstwxyz".split('');
+				var zh = "阿八嚓哒妸发旮哈讥咔垃痳拏噢妑七呥扨它穵夕丫帀".split('');
+
+				var segs = [];
+				var curr;
+				letters.forEach((item, i) => {
+					curr = {
+						letter: item,
+						data: []
+					};
+					arr.forEach((item2) => {
+						if ((!zh[i - 1] || zh[i - 1].localeCompare(item2.name) <= 0) && item2.name
+							.localeCompare(zh[i]) == -1) {
+							curr.data.push(item2);
+						}
+					});
+					if (curr.data.length) {
+						segs.push(curr);
 						this.indexList.push(curr.letter)
-			            curr.data.sort((a,b)=>{
-			                return a.name.localeCompare(b.name);
-			            });
-			        }
-			    });
-			    return segs;
-			}
+						curr.data.sort((a, b) => {
+							return a.name.localeCompare(b.name);
+						});
+					}
+				});
+				return segs;
+			},
+			// 遍历
+			forItem(list) {
+
+				for (let i = 0; i < list.length; i++) {
+					if (list[i].children) {
+						this.forItem(list[i].children)
+					} else {
+						console.log("aaaaa",a);
+						let a = this.userList.filter(item => item.officeDTO.id == list[i].id)
+						if (a.length > 0) {
+							this.$set(list[i], "children", a);
+						}
+					}
+				}
+			},
 		}
 	}
 </script>
 
 <style lang="scss">
 	.list {
-		
+
 		&__item {
 			@include flex;
 			padding: 6px 12px;
 			align-items: center;
-			
+
 			&__avatar {
 				height: 35px;
 				width: 35px;
 				border-radius: 3px;
 			}
-			
+
 			&__user-name {
 				font-size: 16px;
 				margin-left: 10px;
 				color: $u-main-color;
 			}
 		}
-		
+
 		&__footer {
 			color: $u-tips-color;
 			font-size: 14px;
@@ -126,4 +170,4 @@
 			margin: 15px 0;
 		}
 	}
-</style>
+</style>

jp-mobile/pages/fileTransmit/addFileTransmit.vue

@@ -29,7 +29,7 @@
 				</u-form-item>
 				<u-form-item label="收文时间" borderBottom prop="receivingTime" @click="openDate(2)">
 					<jp-datetime-picker :show="isreceive" v-model="inputForm.receivingTime" placeholder="选择收文时间"
-						mode="datetime"></jp-datetime-picker>
+						mode="date"></jp-datetime-picker>
 				</u-form-item>
 				<u-form-item label="内容摘要" borderBottom prop="contentSummary">
 					<u--textarea v-model="inputForm.contentSummary" placeholder="请输入内容摘要" border="none"></u--textarea>
@@ -69,16 +69,18 @@
 		isImageFormat
 	} from "@/common/util.js"
 	import BASE_URL from '@/config.js'
+	import moment from "moment/moment"
 	import * as $auth from "@/common/auth.js"
 	import fileService from '@/api/file/fileService.js'
 	import gwCirculationCard2Service from '@/api/circulation/gwCirculationCard2.js'
 	export default {
 		mounted() {
 			gwCirculationCard2Service.getCardNum().then(data =>{
-				console.log("1111",data);
 				const currentYear = new Date().getFullYear();
 				this.inputForm.yearNum = currentYear
 				this.inputForm.cardNum = "["+currentYear +"]"+data+"号"
+				this.inputForm.writtenTime = moment().format('YYYY-MM-DD');
+				this.inputForm.receivingTime = moment().format('YYYY-MM-DD');
 			})	
 		},
 		data() {
@@ -224,7 +226,9 @@
 			},
 			// 新增图片
 			async afterRead(event) {
-				console.log("event", event);
+				uni.showLoading({
+					title:"上传中"
+				})
 				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
 				let lists = [].concat(event.file)
 				let fileListLen = this.fileLists.length
@@ -266,6 +270,7 @@
 						this.fileList.push(a)
 					}
 				}
+				uni.hideLoading()
 			},
 			async uploadFilePromise(param) {
 				
@@ -303,6 +308,8 @@
 					files.push(item.url)
 				})
 				this.inputForm.attachedDocumentId = files.join(",");
+				this.inputForm.writtenTime = this.inputForm.writtenTime+" 00:00:00";
+				this.inputForm.receivingTime = this.inputForm.receivingTime+" 00:00:00";
 				// this.$refs['inputForm'].validate((valid) => {
 				// 	if (valid) {
 				gwCirculationCard2Service.save(this.inputForm).then((data) => {

jp-mobile/pages/fileTransmit/examineFile.vue

@@ -34,7 +34,8 @@
 						<u-button v-if="isAll" @click="formSubmit" type="success" text="归档"></u-button>
 						<!-- <u-button v-if="!show && one" :disabled="!auditForm.nextLeadUser!=''" type="primary" text="确认签字"
 							@click="show = true"></u-button> -->
-						<u-button v-if="!loading" type="primary" :disabled="!auditForm.nextLeadUser!=''" text="确认签字" @click="doSubmit"></u-button>
+						<u-button v-if="one && !loading" type="primary" :disabled="auditForm.nextLeadUser==''" text="确认签字" @click="doSubmit"></u-button>
+						<u-button v-if="!one && !loading" type="primary"  text="提交" @click="doSubmit"></u-button>
 						<u-button v-if="loading" :loading="loading" type="primary" text="加载中"></u-button>
 					</view>
 				</u--form>
@@ -81,6 +82,7 @@
 <script>
 	import fileCard from "./fileCard.vue"
 	import BASE_URL from '@/config.js'
+	import moment from "moment"
 	import signInput from "@/components/am-sign-input/am-sign-input.vue"
 	import officeUserSelect from "@/components/office-user-select/office-user-select.vue"
 	import userService from "@/api/sys/userService"
@@ -95,7 +97,7 @@
 				if(this.one) {
 					this.roleId = "1770353074553331713"
 				}else {
-					console.log("签字=====",this.one);
+					
 					this.roleId = "1773547256256622594"
 				}
 				userService.leaderList(this.roleId).then(data => {
@@ -214,6 +216,8 @@
 					if (this.auditForm.nextLeadUser != '' || this.auditForm.nextDepUser != '') this.auditForm.next = '1'
 					this.auditForm.state = "0"
 					this.auditForm.gwId = this.gwId
+					const date =  moment().format('YYYY-MM-DD HH:mm:ss');
+					this.auditForm.updateTime = date
 					inputForm = this.auditForm
 				
 				gwFlowService.save(inputForm).then(data => {

jp-mobile/pages/fileTransmit/fileCard.vue

@@ -115,7 +115,8 @@
 					<view class="other_info" v-for="item in fileList">
 						<view class="other_pdf  flex  ">
 							<u--text decoration='underline' color='#36a7f3' :text="item.name"
-								@click="download(item)"></u--text>
+								@click="item.type=='pdf'?preview(item):download(item)"></u--text>
+
 							<!-- <a :href="item.url">{{item.name}}</a> -->
 						</view>
 					</view>
@@ -157,9 +158,13 @@
 						this.imgList.push(img)
 					} else {
 						const fileName = item.split(/[/\\=]/).pop();
+						let type = ""
+						const pdfFormats = /\.pdf$/i;
+						if (pdfFormats.test(item)) type = "pdf";
 						let a = {
 							name: fileName,
-							url: item
+							url: item,
+							type: type
 						}
 						if (!item.startsWith("http")) a.url = this.BASE_URL + item
 						this.fileList.push(a)
@@ -167,7 +172,7 @@
 				})
 			})
 			gwFlowService.queryByGwId(this.gwId).then(data => {
-				
+
 				data.forEach(item => {
 					if (item.which == 0 && item.state == 0) {
 						if (item.signfj && !item.signfj.startsWith("http")) item.signfj = this.BASE_URL +
@@ -183,6 +188,8 @@
 						this.undertakeInfo.push(item)
 					}
 				})
+				this.leaderInfo.sort((a, b) => a.createTime.localeCompare(b.createTime) || a.createTime
+					.localeCompare(b.createTime));
 				this.ismask = false
 			})
 
@@ -232,37 +239,44 @@
 			}
 		},
 		methods: {
+			// 预览pdf
+			preview(fileUrl) {
+				uni.navigateTo({
+					url: "/pages/pdfPreview/pdfPreview?url=" + fileUrl
+				})
+			},
 			// 下载文件
 			download(param) {
-				
-				
+				uni.showLoading({
+					title: "下载中"
+				})
 				uni.downloadFile({
-					url:param.url,//调接口返回url
-					success:(res)=>{
-						// uni.hideLoading();
-						if(res.statusCode==200){
+					url: param.url, //调接口返回url
+					success: (res) => {
+						uni.hideLoading();
+						if (res.statusCode == 200) {
 							var tempFilePath = res.tempFilePath;
-							this.saveFile(tempFilePath,param.name);
-						}else{
+							this.saveFile(tempFilePath, param.name);
+						} else {
 							uni.showToast({
-								icon:'none',
-								title:'报告下载失败'
+								icon: 'none',
+								title: '报告下载失败'
 							})
 						}
 					},
-					fail:err=>{
+					fail: err => {
 						uni.hideLoading();
 						uni.showToast({
-							icon:'none',
-							title:'报告下载失败'
+							icon: 'none',
+							title: '报告下载失败'
 						})
 						reject(err);
 					}
 				})
-			
+
 			},
-			saveFile(url,name){//保存到本地
-				try{
+			saveFile(url, name) { //保存到本地
+				try {
 					const fileName = name;
 					//new Blob 实例化文件流
 					//let url = fileData
@@ -270,7 +284,8 @@
 					const link = document.createElement('a');
 					link.style.display = 'none';
 					link.href = url;
-					link.setAttribute('download',fileName);
+					link.setAttribute('download', fileName);
+					link.setAttribute("target", "_blank");
 					document.body.appendChild(link);
 					link.click();
 					//下载完成移除元素
@@ -278,11 +293,11 @@
 					//释放掉blob对象
 					window.URL.revokeObjectURL(url)
 					uni.showToast({
-						title:'下载成功'
+						title: '下载成功'
 					})
-				}catch(error){
+				} catch (error) {
 					uni.showToast({
-						title:'下载失败'
+						title: '下载失败'
 					})
 				}
 			},

jp-mobile/pages/pdfPreview/pdfPreview.vue

@@ -0,0 +1,20 @@
+<template>
+	<view>
+		<web-view :src="pdfUrl"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pdfUrl: '',
+			};
+		},
+		onLoad(params) {
+			this.pdfUrl = '/hybrid/html/pdf.html?url=' + params.url
+
+		},
+		onBackPress() {}
+	}
+</script>

jp-mobile/static/hybrid/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

jp-mobile/static/hybrid/web/cmaps/CNS2-V.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEáCNS2-H

jp-mobile/static/hybrid/web/cmaps/ETenms-B5-H.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEá	ETen-B5-H`
 ^

jp-mobile/static/hybrid/web/cmaps/GB-H.bcmap

@@ -0,0 +1,4 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE

!!�º]aX!!]`�21�>	�p�z�$]‚�"R‚d�-Uƒ7�*„
4„%�+ „Z „{�/…%…<�9K…b�1]†.�"‡‰`]‡,�"]ˆ
+�"]ˆh�"]‰F�"]Š$�"]‹�"]‹`�"]Œ>�"]��"]�z�"]ŽX�"]�6�"]��"]�r�"]‘P�"]’.�"]“�"]“j�"]”H�"]•&�"]–�"]–b�"]—@�"]˜�"]˜|�"]™Z�"]š8�"]›�"]›t�"]œR�"]�0�"]ž�"]žl�"]ŸJ�"] (�"]¡�"]¡d�"]¢B�"]£ �"X£~�']¤W�"]¥5�"]¦�"]¦q�"]§O�"]¨-�"]©�"]©i�"]ªG�"]«%�"]¬�"]¬a�"]­?�"]®�"]®{�"]¯Y�"]°7�"]±�"]±s�"]²Q�"]³/�"]´
�"]´k�"]µI�"]¶'�"]·�"]·c�"]¸A�"]¹�"]¹}�"]º[�"]»9