入职流程完成

api/oa/entry.js

@@ -0,0 +1,95 @@
+import request from '@/utils/request'
+
+/// 创建流程
+export function create(data) {
+  return request({
+    url: '/bpm/oa-entry/commit',
+    method: 'post',
+    data: data
+  })
+}
+//驳回或撤回后再次提交通用用事项审批流程信息
+export function reCommit(data) {
+  return request({
+    url: '/bpm/oa-entry/reCommit',
+    method: 'post',
+    data: data
+  })
+}
+// 暂存数据保存
+export function save(data) {
+  return request({
+    url: '/bpm/oa-entry/staging',
+    method: 'post',
+    data: data
+  })
+}
+// 暂存数据删除
+export function deleteById(id) {
+  return request({
+    url: 'bpm/oa-entry/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 关闭审批流程信息
+export function closeById(id) {
+  return request({
+    url: '/bpm/oa-entry/close?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得详情
+export function getDetail(id) {
+  return request({
+    url: '/bpm/oa-entry/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得列表
+export function getListData(query) {
+  return request({
+    url: '/bpm/oa-entry/page',
+    method: 'get',
+    params: query
+  })
+}
+// 导出列表
+export function exportList(query) {
+  return request({
+    url: '/bpm/oa-entry/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+//审批同意通用事项审批流程信息
+export function agree(data) {
+  return request({
+    url: '/bpm/oa-entry/agree',
+    method: 'post',
+    data: data
+  })
+}
+
+//驳回通用事项审批流程信息
+export function disagree(data) {
+  return request({
+    url: '/bpm/oa-entry/disagree',
+    method: 'post',
+    data: data
+  })
+}
+
+//撤回通用事项审批流程信息
+export function revocation(data) {
+  return request({
+    url: '/bpm/oa-entry/revocation',
+    method: 'post',
+    data: data
+  })
+}
+

api/system/dict.js

@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+
+// 根据字典类型查询字典数据信息
+export function getDicts(dictType) {
+  return request({
+    url: '/system/dict-data/list-simple?dictType=' + dictType,
+    method: 'get'
+  })
+}
+
+// 根据字典类型获取所有开启状态的数据列表(新增,修改下拉框)
+export function getOpenDicts(dictType) {
+  return request({
+    url: '/system/tenant/dict-data/list-all-simple?dictType=' + dictType,
+    method: 'get',
+  })
+}
+
+
+// 获取岗位精简信息列表
+export function listSimplePosts() {
+  return request({
+    url: '/system/post/list-all-simple',
+    method: 'get'
+  })
+}
+
+// 获取部门精简信息列表
+export function listSimpleDepts() {
+  return request({
+    url: '/system/dept/list-all-simple',
+    method: 'get'
+  })
+}
+

pages.json

@@ -3,8 +3,8 @@
   "pages": [{
     "path": "pages/index",
     "style": {
-      "navigationBarTitleText": "智企云"
-      // "navigationStyle": "custom"
+      "navigationBarTitleText": "智企云",
+      "navigationStyle": "custom"
     }
   }, {
     "path": "pages/login",
@@ -76,6 +76,11 @@
     "style": {
       "navigationBarTitleText": "通用审批"
     }
+  },{
+    "path": "pages/oa/entry/index",
+    "style": {
+      "navigationBarTitleText": "入职审批"
+    }
   },{
 			"path": "pages/popleSelect/choose",
 			"style": {

pages/oa/entry/detail.vue

@@ -0,0 +1,357 @@
+<template>
+	<view class="container">
+		<uni-forms ref="form" :model="form" labelWidth="80px" :label-position="alignment">
+			<uni-forms-item label="入职人">
+				<uni-easyinput v-model="form.entryName" disabled />
+			</uni-forms-item>
+			<uni-forms-item label="部门">
+				<uni-easyinput v-model="form.deptName" disabled />
+			</uni-forms-item>
+			<uni-forms-item label="职位">
+				<uni-easyinput v-model="form.position" disabled />
+			</uni-forms-item>
+			<uni-forms-item label="员工类型">
+				<uni-easyinput v-model="form.employeeTypeDesc" disabled />
+			</uni-forms-item>
+			<uni-forms-item label="性别">
+				<uni-easyinput v-model="form.gender" disabled />
+			</uni-forms-item>
+			<uni-forms-item label="出生日期">
+				<uni-easyinput v-model="form.birthday" disabled />
+			</uni-forms-item>
+			<uni-forms-item label="联系电话">
+				<uni-easyinput v-model="form.contactNumber" disabled />
+			</uni-forms-item>
+			<uni-forms-item label="电子邮箱">
+				<uni-easyinput v-model="form.email" disabled />
+			</uni-forms-item>
+			<uni-forms-item label="教育背景">
+				<uni-easyinput autoHeight type="textarea" v-model="form.education" disabled />
+			</uni-forms-item>
+			<uni-forms-item label="工作经验">
+				<uni-easyinput autoHeight type="textarea" v-model="form.workExperience" disabled />
+			</uni-forms-item>
+			<uni-forms-item label="附件">
+				<view class="upload-wrap">
+					<view class="mgb-16 file-wrap" v-for="(item, index) in form.fileList" :key="index">
+					  <view class="btn-click file-line" @click="handlePreview(item)">
+					    <view class="file-info">
+					      <image :src="icons.file" mode="aspectFill" class="file-icon" />
+					      <text class="file-name">{{ item.name || title[type] }}</text>
+					    </view>
+					  </view>
+					</view>
+				</view>
+			</uni-forms-item>
+			<uni-forms-item label="备注">
+				<uni-easyinput autoHeight type="textarea" v-model="form.remarks" disabled />
+			</uni-forms-item>
+			<uni-forms-item label="审批意见" required v-if="(form.auditStatus==2 || form.auditStatus==1) && name=='0'">
+				<uni-easyinput autoHeight maxlength="200" type="textarea" v-model="reason" placeholder="请输入审批建议" />
+			</uni-forms-item>
+			<uni-forms-item label="流程动态">
+				<uni-steps active-icon="medal" :options="tasks" active-color="#007AFF" :active="tasks.length" direction="column" />
+			</uni-forms-item>
+		</uni-forms>
+		<view class="button-group" v-if="name=='0'">
+			<button type="primary" size="mini" @click="handleAudit(true)">同意</button>
+			<button size="mini" @click="handleAudit(false)">驳回</button>
+		</view>
+		<view class="button-group" v-if="name=='2'">
+			<button type="warning" size="mini" @click="handleRevocation('form')">撤回</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getDetail,revocation,agree,disagree } from "@/api/oa/entry.js"
+	export default {
+		props: {
+		    id: {
+		      type: [String, Number],
+		      default: undefined
+		    },
+		    name: {
+		      type: String,
+		      default: undefined
+		    },
+		  },
+		data() {
+			return {
+				reason:'',
+				active: -1,
+				tasks: [],
+				alignment:'top',
+				fileList: [],
+				icons: {
+				  file: '/static/icon_file.png',
+				},
+				// 表单数据
+				form: {},
+			}
+		},
+		watch: {
+		    id: {
+		      immediate: true,
+		      handler(val) {
+		        this.getDetail(val);
+		      }
+		    }
+		  },
+		methods: {
+			  /** 获得详情信息 */
+			    getDetail(val) {
+			      getDetail(val).then(response => {
+					let gender = response.data.gender==1?'男':'女';
+			        this.form = response.data;
+					this.form.gender = gender;
+			        let auditRecordList = response.data.auditRecordList;
+					let tasks = [];
+					auditRecordList.forEach(v => {
+						tasks.push({
+							title:'任务:' + v.assigneeUser.nickname + v.name,
+							desc:this.parseTime(v.endTime),
+						})
+					})
+					this.tasks = tasks;
+			      });
+			    },
+			// 预览
+			handlePreview(val) {
+			  console.log('PreviewFile', val);
+			  const fileType = this.getFileType(val.name);
+			  if (fileType === 'image') {
+			   uni.previewImage({
+			     current: 0,
+			     urls: [val.url],
+			   });
+			  }
+			  else if (fileType === 'office') {
+				  return uni.downloadFile({
+				    url: val.url, 
+				    success: function (res) {
+				      let filePath = res.filePath || res.tempFilePath;
+				      uni.openDocument({
+				        filePath: filePath,
+				        showMenu: true,
+				        success: function (res) {
+				          console.log('打开文档成功');
+				        }
+				      });
+				    }
+				  });
+			  }
+			  else{
+				  uni.showModal({
+				    title: '该类型文件无法预览',
+				    content: val.name,
+				    showCancel: false,
+				  });
+			  }
+			  
+			},
+			handleRevocation(){
+			      console.log(this.form.taskId);
+				  let that = this
+				  uni.showModal({
+				          title: '提示',
+				          content: '是否确认撤回?',
+				          success: function (res) {
+				            if (res.confirm) {
+				              console.log('用户点击确定');
+				              revocation({id:that.form.taskId}).then(response => {
+				               uni.showToast({
+				               	title: "撤回成功！"
+				               })
+				              })
+				            } else if (res.cancel) {
+				              console.log('用户点击取消');
+				            }
+				          }
+				        });
+			    },
+			    handleAudit(pass) {
+			      if (!this.reason) {
+					uni.showModal({
+						title: "提示",
+						content: "请填写审批意见",
+						showCancel: false,
+						confirmText: "确定"
+					})
+			        return;
+			      } else {
+			        const data = {
+			          id: this.form.taskId,
+			          reason: this.reason,
+			        }
+			        if (pass) {
+			          agree(data).then(response => {
+						  uni.showToast({
+						  	title: "审批通过成功！"
+						  })
+						  this.$emit('popupClose');
+			          });
+			        } else {
+			          disagree(data).then(response => {
+						  uni.showToast({
+						  	title: "驳回成功！"
+						  })
+						  this.$emit('popupClose');
+			          });
+			        }
+			      }
+			    },
+			
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.container {
+		padding: 15px;
+		background-color: #fff;
+	}
+
+	.segmented-control {
+		margin-bottom: 15px;
+	}
+
+	.button-group {
+		margin-top: 15px;
+		display: flex;
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		flex: 1;
+	}
+
+	.button {
+		display: flex;
+		align-items: center;
+		height: 35px;
+		line-height: 35px;
+		margin-left: 10px;
+	}
+</style>
+<style lang="scss" scoped>
+	.user-avatar {
+	  width: 22px;
+	  height: 22px;
+	  line-height: 19px;
+	  font-size: 12px;
+	  background: #46c26f;
+	  border: 1px solid transparent;
+	  border-radius: 5px;
+	  color: #fff;
+	  display: inline-block;
+	  overflow: hidden;
+	  text-align: center;
+	  line-height: 22px;
+	  margin-bottom: 2px;
+	}
+	.popup-body{
+		z-index: 99;
+		height: 450px;
+		overflow-x: auto;
+		// margin-bottom: 60px;
+	}
+	.popup-close{
+		cursor: pointer;
+		height: 40px;
+		line-height: 40px;
+		padding-left: 10px;
+		border-bottom: 1px solid #eaecef;
+	}
+	.popup-content{
+		margin: 20px;
+	}
+.btn-click {
+  transition: all 0.3s;
+  opacity: 1;
+}
+
+.btn-click:active {
+  opacity: 0.5;
+}
+
+.mgb-16 {
+  margin-bottom: 16rpx;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.upload-wrap {
+  width: 100%;
+  border-radius: 16rpx;
+  background: white;
+  // padding: 32rpx;
+
+  .upload-btn {
+    width: 100%;
+    height: 176rpx;
+    border: 2rpx dashed #AAAAAA;
+    background: #FAFAFA;
+    border-radius: 16rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+
+    .upload-icon {
+      width: 48rpx;
+      height: 48rpx;
+      margin-bottom: 8rpx;
+    }
+
+    .upload-text {
+      font-size: 26rpx;
+      color: #9E9E9E;
+      line-height: 40rpx;
+    }
+  }
+
+  .file-wrap {
+    .file-line {
+      width: 100%;
+      background: #F5F5F5;
+      border-radius: 8rpx;
+      padding: 16rpx;
+      font-size: 26rpx;
+      color: #1A1A1A;
+      line-height: 40rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      .file-info {
+        width: 90%;
+        display: flex;
+        align-items: center;
+
+        .file-name {
+          max-width: 80%;
+          padding-left: 16rpx;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+      }
+
+      .file-icon {
+        width: 40rpx;
+        height: 40rpx;
+        flex-shrink: 0;
+      }
+
+      .file-empty {
+        color: #999999;
+      }
+    }
+  }
+}
+</style>

pages/oa/entry/edit.vue

@@ -0,0 +1,660 @@
+<template>
+	<view class="container">
+		<uni-forms ref="form" :rules="rules" :model="form" labelWidth="80px" :label-position="alignment">
+			<uni-forms-item label="入职人" required name="entryName">
+				<uni-easyinput v-model="form.entryName" placeholder="请输入"/>
+			</uni-forms-item>
+			<uni-forms-item label="部门" required name="deptId">
+				<uni-data-select v-model="form.deptId" :localdata="deptOptions">
+				</uni-data-select>
+			</uni-forms-item>
+			<uni-forms-item label="职位" required name="postId">
+				<uni-data-select v-model="form.postId" :localdata="postOptions">
+				</uni-data-select>
+			</uni-forms-item>
+			<uni-forms-item label="员工类型" required name="employeeType">
+				<uni-data-select v-model="form.employeeType" :localdata="employeeTypeListOpen">
+				</uni-data-select>
+			</uni-forms-item>
+			<uni-forms-item label="性别" required name="gender">
+				<uni-data-select v-model="form.gender" :localdata="userSexList">
+				</uni-data-select>
+			</uni-forms-item>
+			<uni-forms-item label="出生日期" required name="birthday">
+				<uni-datetime-picker type="date" v-model="form.birthday"/>
+			</uni-forms-item>
+			
+			<uni-forms-item label="联系电话" required name="contactNumber">
+				<uni-easyinput v-model="form.contactNumber" placeholder="请输入"/>
+			</uni-forms-item>
+			<uni-forms-item label="电子邮箱" required name="email">
+				<uni-easyinput v-model="form.email" placeholder="请输入"/>
+			</uni-forms-item>
+			<uni-forms-item label="教育背景">
+				<uni-easyinput maxlength="50" type="textarea" v-model="form.education" placeholder="请输入" />
+			</uni-forms-item>
+			<uni-forms-item label="工作经验">
+				<uni-easyinput maxlength="200" type="textarea" v-model="form.workExperience" placeholder="请输入" />
+			</uni-forms-item>
+			<uni-forms-item label="入职日期" required name="entryDate">
+				<uni-datetime-picker type="date" v-model="form.entryDate"/>
+			</uni-forms-item>
+			<uni-forms-item label="附件">
+				<view class="upload-wrap">
+					<button type="primary" size="mini" @click="handleUploadClick">点击上传</button>
+					<xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
+					<view class="mgb-16 file-wrap" v-for="(item, index) in fileList" :key="index">
+						<view class="btn-click file-line" @click="handlePreview(item)">
+							<view class="file-info">
+								<image :src="icons.file" mode="aspectFill" class="file-icon" />
+								<text class="file-name">{{ item.name || title[type] }}</text>
+							</view>
+							<image :src="icons.close" mode="aspectFill" class="file-icon"
+								@click.stop="handleDeleteFile(index)" />
+						</view>
+					</view>
+				</view>
+
+			</uni-forms-item>
+			<uni-forms-item label="备注">
+				<uni-easyinput maxlength="200" type="textarea" v-model="form.remarks" placeholder="请输入备注" />
+			</uni-forms-item>
+			<uni-forms-item label="审批人" required name="peopleList">
+				<uni-easyinput v-model="form.peopleList" style="display: none;" />
+				<view style="display: flex;justify-content: flex-start;align-items: center;">
+					<uni-icons type="folder-add" size="40" @click="gotochooseUser"></uni-icons>
+					<view style="display: flex;justify-content: flex-start;align-items: center;"
+						v-for="(tag, index) in nikeNamelist" :key="index">
+						<uni-icons type="right" size="20"></uni-icons>
+						<view style="display: flex;flex-direction: column;justify-content: center;align-items: center;"
+							@click="handleClose(index)">
+							<span class="user-avatar">{{ tag.substring(0, 1) || 'U' }}</span>
+							<text style="font-size: 12px;">{{tag}}</text>
+						</view>
+
+					</view>
+				</view>
+			</uni-forms-item>
+			<uni-forms-item label="流程动态" v-if="tasks.length > 0">
+				<uni-steps active-icon="medal" :options="tasks" active-color="#007AFF" :active="tasks.length"
+					direction="column" />
+			</uni-forms-item>
+		</uni-forms>
+		<view class="button-group" v-if="name == '0'">
+			<button type="default" size="mini" @click="onReCommit('form')">提交</button>
+			<button type="primary" size="mini" @click="onClose()">关闭</button>
+		</view>
+		<view class="button-group" v-else>
+			<button type="primary" size="mini" @click="submit('form')">提交</button>
+			<button type="default" size="mini" @click="onSave()">暂存</button>
+			<button type="danger" size="mini" @click="onDelete()" v-if="form.auditStatus == 0">删除</button>
+		</view>
+
+		<view>
+			<!-- 普通弹窗 -->
+			<uni-popup ref="popup" background-color="#fff" border-radius="10px 10px 0 0">
+				<view class="popup-body">
+					<view class="popup-close">
+						<uni-icons type="closeempty" size="20" @click="popupClose"></uni-icons>
+					</view>
+					<view class="popup-content">
+						<pople-Select @submit="submitPeople" ref="popleSelect"></pople-Select>
+					</view>
+				</view>
+
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getDetail,
+		create,
+		save,
+		deleteById,
+		closeById,
+		reCommit
+	} from "@/api/oa/entry.js"
+	import {getDicts,getOpenDicts,listSimplePosts,listSimpleDepts } from "@/api/system/dict.js";
+	import {
+		uploadFile
+	} from "@/api/system/user"
+	import popleSelect from '../../popleSelect/choose.vue'
+	export default {
+		components: {
+			popleSelect
+		},
+		props: {
+			id: {
+				type: [String, Number],
+				default: undefined
+			},
+			name: {
+				type: String,
+				default: undefined
+			},
+		},
+		data() {
+			return {
+				deptOptions:[],
+				postOptions:[],
+				employeeTypeListOpen:[],
+				userSexList:[],
+				tasks: [],
+				userInfo: uni.getStorageSync('userInfo'),
+				alignment: 'top',
+				uploadOptions: {},
+				fileList: [],
+				icons: {
+					close: '/static/icon_close.png',
+					file: '/static/icon_file.png',
+				},
+				nikeNamelist: [],
+				// 表单数据
+				form: {
+					entryName: undefined,
+					deptId: undefined,
+					postId: undefined,
+					employeeType: undefined,
+					gender: undefined,
+					birthday: undefined,
+					contactNumber: undefined,
+					email: undefined,
+					education: undefined,
+					workExperience: undefined,
+					entryDate: undefined,
+					fileIdList: undefined,
+					remarks: undefined,
+					peopleList: '',
+				},
+				// 校验规则
+				rules: {
+					entryName: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入'
+						}, ]
+					},
+					deptId: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择'
+						}, ]
+					},
+					postId: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择'
+						}, ]
+					},
+					employeeType: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择'
+						}, ]
+					},
+					gender: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择'
+						}, ]
+					},
+					birthday: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择'
+						}, ]
+					},
+					contactNumber: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入'
+						}, ]
+					},
+					email: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入'
+						}, ]
+					},
+					entryDate: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择'
+						}, ]
+					},
+					peopleList: {
+						rules: [{
+							required: true,
+							errorMessage: '请选择审批人'
+						}, ]
+					},
+				},
+			}
+		},
+		  watch: {
+		    id: {
+		      immediate: true,
+		      handler(val) {
+				this.getInfoDataList();
+		        if (val) {
+		          this.getDetail(val);
+		        }
+		      }
+		    }
+		  },
+		methods: {
+			maskClick(e) {
+				console.log('----maskClick事件:', e);
+			},
+			 /** 查询部门列表 */
+			 getInfoDataList() {
+				listSimpleDepts().then(response => {
+					response.data.forEach(v => {
+						this.deptOptions.push({
+							text: v.name,
+							value: v.id,
+						})
+					})
+				});
+				getDicts('system_user_sex').then(response => {
+					response.data.forEach(v => {
+						this.userSexList.push({
+							text: v.label,
+							value: v.value,
+						})
+					})
+				});
+				getOpenDicts('tenant_employee_type').then(response => {
+					response.data.forEach(v => {
+						this.employeeTypeListOpen.push({
+							text: v.label,
+							value: v.value,
+						})
+					})
+				});
+				listSimplePosts().then(response => {
+					response.data.forEach(v => {
+						this.postOptions.push({
+							text: v.name,
+							value: v.id,
+						})
+					})
+				});
+			},
+			/** 获得详情信息 */
+			getDetail(val) {
+				getDetail(val).then(response => {
+					this.form = response.data;
+					console.log(this.form);
+					this.fileList = response.data.fileList ? response.data.fileList : [];
+					let auditUserList = response.data.auditUserList;
+					if (auditUserList) {
+						let peopleList = [];
+						let nikeNamelist = [];
+						auditUserList.map(item => {
+							peopleList.push(item.id);
+							nikeNamelist.push(item.nickname)
+						});
+						this.$set(this.form, 'peopleList', peopleList.join(','));
+						this.nikeNamelist = nikeNamelist;
+					} else {
+						this.$set(this.form, 'peopleList', '');
+						this.nikeNamelist = [];
+					}
+					let auditRecordList = response.data.auditRecordList;
+					if (auditRecordList) {
+						let tasks = [];
+						auditRecordList.forEach(v => {
+							tasks.push({
+								title: '任务:' + v.assigneeUser.nickname + v.name,
+								desc: this.parseTime(v.endTime),
+							})
+						})
+						this.tasks = tasks;
+					}
+				});
+			},
+			// 关闭标签
+			handleClose(index) {
+				this.nikeNamelist.splice(index, 1);
+				let peopleList = this.form.peopleList.split(',');
+				peopleList.splice(index, 1);
+				this.form.peopleList = peopleList.join(',');
+			},
+			submitPeople(userList, nikeNamelist, userIdList) {
+				console.log(userList);
+				console.log(userIdList);
+				this.nikeNamelist = nikeNamelist;
+				this.form.peopleList = userIdList.join(',');
+				this.$refs.popup.close();
+			},
+			popupClose() {
+				this.$refs.popup.close();
+			},
+			gotochooseUser() {
+				this.$refs.popup.open('bottom');
+				setTimeout(() => {
+					this.$refs.popleSelect.getInfoData();
+				})
+			},
+			handleUploadClick() {
+				this.$refs.XeUpload.upload('file');
+			},
+			handleUploadCallback(e) {
+				console.log('UploadCallback', e);
+				let data = {
+					filePath: e.data[0].tempFilePath
+				}
+				uploadFile(data).then(response => {
+					const tmpFiles = ([response.data] || []).map(({
+						id,
+						url,
+						name,
+						type
+					}) => {
+						return {
+							id,
+							url,
+							name,
+							type,
+						};
+					});
+					this.fileList.push(...tmpFiles);
+				})
+			},
+			// 预览
+			handlePreview(val) {
+				console.log('PreviewFile', val);
+				const fileType = this.getFileType(val.name);
+				if (fileType === 'image') {
+					uni.previewImage({
+						current: 0,
+						urls: [val.url],
+					});
+				} else if (fileType === 'office') {
+					return uni.downloadFile({
+						url: val.url,
+						success: function(res) {
+							let filePath = res.filePath || res.tempFilePath;
+							uni.openDocument({
+								filePath: filePath,
+								showMenu: true,
+								success: function(res) {
+									console.log('打开文档成功');
+								}
+							});
+						}
+					});
+				} else {
+					uni.showModal({
+						title: '该类型文件无法预览',
+						content: val.name,
+						showCancel: false,
+					});
+				}
+
+			},
+			handleDeleteFile(index) {
+				this.fileList.splice(index, 1);
+			},
+			submit(ref) {
+				this.$refs[ref].validate().then(res => {
+					this.form.startUserSelectAssignees = this.form.peopleList.split(',');
+					this.form.auditPass = true;
+					create(this.form).then(response => {
+						uni.showToast({
+							title: `提交成功`
+						})
+						if(this.id){
+							this.$emit('popupClose');
+						}else{
+							setTimeout(() => {
+								this.$router.go(0)
+							}, 500)
+						}
+						
+					}).catch(() => {
+						
+					});
+				}).catch(err => {
+					console.log('err', err);
+				})
+			},
+			//暂存
+			onSave() {
+				if (this.form.peopleList) {
+					this.form.startUserSelectAssignees = this.form.peopleList.split(',');
+				}
+				this.form.auditPass = false;
+				save(this.form).then(response => {
+					uni.showToast({
+						title: `暂存成功`
+					})
+					if(this.id){
+						this.$emit('popupClose');
+					}else{
+							setTimeout(() => {
+								this.$router.go(0)
+							}, 500)
+						}
+				}).catch(() => {
+					
+				});
+			},
+			//驳回或撤回后再次提交
+			    onReCommit(ref) {
+			      this.$refs[ref].validate().then(res => {
+			      	this.form.startUserSelectAssignees = this.form.peopleList.split(',');
+			      	this.form.auditPass = true;
+			      	reCommit(this.form).then(response => {
+						uni.showToast({
+							title: `提交成功`
+						})
+					  this.$emit('popupClose');
+			      	}).catch(() => {
+						
+					});
+			      }).catch(err => {
+			      	console.log('err', err);
+			      })
+			    },
+			//暂存删除
+			async onDelete() {
+				let that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否确认删除?',
+					success: function(res) {
+						if (res.confirm) {
+							console.log('用户点击确定');
+							deleteById(that.id).then(response => {
+								uni.showToast({
+									title: "删除成功！"
+								})
+								that.$emit('popupClose');
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			//暂存关闭
+			async onClose() {
+				let that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否确认关闭?',
+					success: function(res) {
+						if (res.confirm) {
+							console.log('用户点击确定');
+							closeById(that.id).then(response => {
+								uni.showToast({
+									title: "流程已关闭！"
+								})
+								that.$emit('popupClose');
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.container {
+		padding: 15px;
+		background-color: #fff;
+	}
+
+	.segmented-control {
+		margin-bottom: 15px;
+	}
+
+	.button-group {
+		margin-top: 15px;
+		display: flex;
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		flex: 1;
+	}
+
+	.button {
+		display: flex;
+		align-items: center;
+		height: 35px;
+		line-height: 35px;
+		margin-left: 10px;
+	}
+</style>
+<style lang="scss" scoped>
+	.user-avatar {
+		width: 22px;
+		height: 22px;
+		line-height: 19px;
+		font-size: 12px;
+		background: #46c26f;
+		border: 1px solid transparent;
+		border-radius: 5px;
+		color: #fff;
+		display: inline-block;
+		overflow: hidden;
+		text-align: center;
+		line-height: 22px;
+		margin-bottom: 2px;
+	}
+
+	.popup-body {
+		z-index: 99;
+		margin-bottom: 30px;
+	}
+
+	.popup-close {
+		cursor: pointer;
+		height: 40px;
+		line-height: 40px;
+		padding-left: 10px;
+		border-bottom: 1px solid #eaecef;
+	}
+
+	.popup-content {
+		height: 450px;
+		overflow-x: auto;
+		margin: 20px;
+	}
+
+	.btn-click {
+		transition: all 0.3s;
+		opacity: 1;
+	}
+
+	.btn-click:active {
+		opacity: 0.5;
+	}
+
+	.mgb-16 {
+		margin-bottom: 16rpx;
+
+		&:last-child {
+			margin-bottom: 0;
+		}
+	}
+
+	.upload-wrap {
+		width: 100%;
+		border-radius: 16rpx;
+		background: white;
+		// padding: 32rpx;
+
+		.upload-btn {
+			width: 100%;
+			height: 176rpx;
+			border: 2rpx dashed #AAAAAA;
+			background: #FAFAFA;
+			border-radius: 16rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+
+			.upload-icon {
+				width: 48rpx;
+				height: 48rpx;
+				margin-bottom: 8rpx;
+			}
+
+			.upload-text {
+				font-size: 26rpx;
+				color: #9E9E9E;
+				line-height: 40rpx;
+			}
+		}
+
+		.file-wrap {
+			.file-line {
+				width: 100%;
+				background: #F5F5F5;
+				border-radius: 8rpx;
+				padding: 16rpx;
+				font-size: 26rpx;
+				color: #1A1A1A;
+				line-height: 40rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.file-info {
+					width: 90%;
+					display: flex;
+					align-items: center;
+
+					.file-name {
+						max-width: 80%;
+						padding-left: 16rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+				}
+
+				.file-icon {
+					width: 40rpx;
+					height: 40rpx;
+					flex-shrink: 0;
+				}
+
+				.file-empty {
+					color: #999999;
+				}
+			}
+		}
+	}
+</style>

pages/oa/entry/index.vue

@@ -0,0 +1,185 @@
+<template>
+	<view class='purchase-list'>
+		<my-tabs @change="tapChange" :initIndex="initIndex"></my-tabs>
+		<scroll-view class="purchase-body" scroll-y="true" @scrolltolower="scrolltolower" @scroll="scroll">
+			<view v-if="initIndex === 0">
+				<!-- <form-Create></form-Create> -->
+				<form-Edit @popupClose="popupClose"></form-Edit>
+			</view>
+			<view v-if="initIndex === 1">
+				<view class="searchBox">
+					<uni-search-bar placeholder="请输入搜索内容" @confirm="search" @blur="blur" @cancel="cancel" @clear="clear">
+					</uni-search-bar>
+				</view>
+				<data-List v-for="(item,index) in listData" :key="index" :info="item" @faClick="handdle"></data-List>
+				<uni-fab :pattern="pattern" :horizontal="horizontal" :vertical="vertical"
+									:direction="direction" @fabClick="fabClick" />
+				<!-- 普通弹窗 -->
+				<uni-popup ref="popup" background-color="#fff" border-radius="10px 10px 0 0">
+					<view class="popup-body">
+						<view class="popup-close">
+							<uni-icons type="closeempty" size="20" @click="popupClose"></uni-icons>
+						</view>
+						<view class="popup-content">
+							<form-Edit :id="id" v-if="status=='暂存'" @popupClose="popupClose"></form-Edit>
+							<form-Detail :id="id" v-else @popupClose="popupClose"></form-Detail>
+						</view>
+					</view>
+					
+				</uni-popup>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+<script>
+	import { getListData } from "@/api/oa/entry"
+	import myTabs from '../myTabs.vue'
+	import dataList from '../dataList.vue'
+	import formDetail from './detail.vue'
+	import formEdit from './edit.vue'
+	import myPull from '@/static/js/myPull.js'
+	export default {
+		components:{myTabs,dataList,formEdit,formDetail},
+		data() {
+			return {
+				id:'',
+				status:'',
+				initIndex: 0,
+				employeeName:'',
+				pageNo: 1,
+				pageSize: 10,
+				horizontal: 'right',
+				vertical: 'bottom',
+				direction: 'horizontal',
+				pattern: {
+					color: '#7A7E83',
+					backgroundColor: '#fff',
+					selectedColor: '#007AFF',
+					buttonColor: '#007AFF',
+					iconColor: '#fff'
+				},
+			}
+		},
+		onLoad(){
+			this.refresh();
+		},
+		methods: {
+			fabClick() {
+				this.initIndex = 0;
+							
+			},
+			search(res) {
+				this.employeeName = res.value;
+				this.page = 1;
+				this.getList(this.page,this.__pulldone)
+			},
+			clear(res) {
+				this.employeeName = '';
+				this.page = 1;
+				this.getList(this.page,this.__pulldone)
+			},
+			blur(res) {
+				this.employeeName = res.value;
+				this.page = 1;
+				this.getList(this.page,this.__pulldone)
+			},
+			cancel(res) {
+				this.employeeName = '';
+				this.page = 1;
+				this.getList(this.page,this.__pulldone)
+			},
+			popupClose(){
+				this.$refs.popup.close();
+				this.page = 1;
+				this.getList(this.page,this.__pulldone)
+			},
+			handdle(row) {
+				this.$refs.popup.open('bottom');
+			    this.id = row.id;
+				this.status = row.status;
+			},
+			fabClick() {
+				this.initIndex = 0;
+			},
+			/**
+			 * @name 获取列表
+			 */
+			getList(page,done){
+				if(this.initIndex==1){
+					getListData({pageNo:page,pageSize: this.pageSize,employeeName:this.employeeName}).then(response => {
+						let dataList = response.data.list;
+						let list = []
+						dataList.forEach(v => {
+							list.push({
+								id:v.id,
+								oaType:v.applyEmployeeName+'提交的入职审批',
+								time:v.createTime,
+								title:v.title,
+								remarks:v.remarks,
+								status: v.auditStatusDesc,
+								nickname:v.currentAuditEmployeeName
+							})
+						})
+						done(list);
+					});
+				}
+			},
+			
+			/**
+			 * @name 触底加载
+			 */
+			scrolltolower(event){
+				this.getList(this.page,this.__pulldone)
+			},
+			
+			scroll(e){
+				// 重新设置pulldown
+				this.setPullDown(e.detail.scrollTop<10)
+			},
+			/**
+			 * @name 改变tab
+			 * @param val 索引
+			 */
+			tapChange(val){
+				this.initIndex=val;
+				this.page = 1;
+				this.getList(this.page,this.__pulldone)
+			}
+		},
+		mixins:[myPull({})],
+		
+	}
+</script>
+<style lang='scss' scoped>
+	.searchBox{
+		background-color: #fff;
+		position: -webkit-sticky; /* Safari */
+		position: sticky;
+		top: 0; /* 设置元素距离顶部的位置 */
+		width: 100%;
+	}
+	.popup-body{
+		z-index: 99;
+	}
+	.popup-close{
+		cursor: pointer;
+		height: 40px;
+		line-height: 40px;
+		padding-left: 10px;
+		border-bottom: 1px solid #eaecef;
+	}
+	.popup-content{
+		height: 450px;
+		overflow-x: auto;
+	}
+	.purchase-list {
+		background-color: #f5f5f5;
+		height: 100%;
+		overflow: hidden;
+		
+		.purchase-body{
+			height: calc(100% - 88upx);
+			overflow: auto
+		}
+	}
+</style>

pages/oa/universal/edit.vue

@@ -74,11 +74,11 @@
 			<!-- 普通弹窗 -->
 			<uni-popup ref="popup" background-color="#fff" border-radius="10px 10px 0 0">
 				<view class="popup-body">
-					<!-- <view class="popup-close">
+					<view class="popup-close">
 						<uni-icons type="closeempty" size="20" @click="popupClose"></uni-icons>
-					</view> -->
+					</view>
 					<view class="popup-content">
-						<pople-Select @submit="submitPeople"></pople-Select>
+						<pople-Select @submit="submitPeople" ref="popleSelect"></pople-Select>
 					</view>
 				</view>
 
@@ -223,9 +223,9 @@
 			},
 			gotochooseUser() {
 				this.$refs.popup.open('bottom');
-				// uni.navigateTo({
-				// 	url:'/pages/popleSelect/choose'
-				// })
+				setTimeout(() => {
+					this.$refs.popleSelect.getInfoData();
+				})
 			},
 			handleUploadClick() {
 				this.$refs.XeUpload.upload('file');
@@ -442,9 +442,7 @@
 
 	.popup-body {
 		z-index: 99;
-		height: 450px;
-		overflow-x: auto;
-		// margin-bottom: 60px;
+		margin-bottom: 30px;
 	}
 
 	.popup-close {
@@ -456,6 +454,8 @@
 	}
 
 	.popup-content {
+		height: 450px;
+		overflow-x: auto;
 		margin: 20px;
 	}
 

pages/oa/universal/index.vue

@@ -11,8 +11,9 @@
 					<uni-search-bar placeholder="请输入搜索内容" @confirm="search" @blur="blur" @cancel="cancel" @clear="clear">
 					</uni-search-bar>
 				</view>
-				
 				<data-List v-for="(item,index) in listData" :key="index" :info="item" @faClick="handdle"></data-List>
+				<uni-fab :pattern="pattern" :horizontal="horizontal" :vertical="vertical"
+									:direction="direction" @fabClick="fabClick" />
 				<!-- 普通弹窗 -->
 				<uni-popup ref="popup" background-color="#fff" border-radius="10px 10px 0 0">
 					<view class="popup-body">
@@ -63,6 +64,10 @@
 			this.refresh();
 		},
 		methods: {
+			fabClick() {
+				this.initIndex = 0;
+							
+			},
 			search(res) {
 				this.employeeName = res.value;
 				this.page = 1;
@@ -101,7 +106,7 @@
 			 */
 			getList(page,done){
 				if(this.initIndex==1){
-					getListData({pageNo:page,pageSize: this.pageSize,employeeName:this.employeeName}).then(response => {
+					getListData({pageNo:page,pageSize: this.pageSize,str:this.employeeName}).then(response => {
 						let dataList = response.data.list;
 						let list = []
 						dataList.forEach(v => {

pages/popleSelect/choose.vue

@@ -8,7 +8,7 @@
 			<view class="bread" v-if='isShow'
 				style='display: flex;align-items:center; margin-left: 5px;height: 100rpx;width: 750rpx;'>
 				<view style='margin-right:5rpx;' @click='goBigBread()'>
-					神州通誉
+					通讯录
 				</view>
 				<view v-for='(it,i) in breadList' @click='goBread(it,i)' :key='i'>
 					<text style='margin-left: 5px;margin-right: 5px;'>></text>
@@ -135,6 +135,10 @@
 			this.getList()
 		},
 		methods: {
+			getInfoData() {
+				this.getDeptTree()
+				this.getList()
+			},
 			/** 查询部门下拉树结构 */
 			getDeptTree() {
 				listSimpleDepts().then(response => {