bug调整及员工转正申请

src/api/jy/BorrowService.js

@@ -106,4 +106,12 @@ export default class BorrowService{
 		})
 	}
 
+	findHisById (id) {
+		return request({
+			url: prefix +'/borrow/findHisById',
+			method: 'get',
+			params: {id: id}
+		})
+	}
+
 }

src/api/jy/EntryService.js

@@ -75,5 +75,29 @@ export default class EntryService{
 		});
 	}
 
+	queryByApplyId(id){
+		return request({
+			url: prefix +'/employeeEntry/findByApplyId',
+			method: 'get',
+			params: {id: id}
+		})
+	}
+
+	saveApplyForm (inputForm) {
+		return request({
+			url: prefix + `/employeeEntry/saveApplyForm`,
+			method: 'post',
+			data: inputForm
+		})
+	}
+
+	updateStatusByApplyId(data) {
+		return request({
+			url: prefix + "/employeeEntry/updateStatusByApplyId",
+			method: "post",
+			data: data,
+		})
+	}
+
 
 }

src/api/sys/userService.js

@@ -125,6 +125,19 @@ export default {
 			method: "get",
 		});
 	},
+	isBmzr:function() {
+		return request({
+			url: prefix + "/sys/user/isBmzr",
+			method: "get",
+		});
+	},
+
+	checkIsJyAdmin:function() {
+		return request({
+			url: prefix + "/sys/user/isJyAdmin",
+			method: "get",
+		});
+	},
 
 	queryDetailList(ids) {
 		return request({
@@ -177,5 +190,13 @@ export default {
 			params: {id:id}
 		});
 	},
+	updateLoginFlag1(id) {
+		return request({
+			url: prefix + `/sys/user/updateLoginFlag1`,
+			method: "post",
+			params: {id:id}
+		});
+	},
+
 
 };

src/views/dashboard/widgets/components/MyNotifyList.vue

@@ -3,7 +3,7 @@
 		<template #header>
 			<div class="card-header">
 				<span>公告
-				<el-badge class="mark" v-if="backlogCount !== 0" :value="backlogCount" :max="99" style="line-height: 0;margin-top: 8px"/>
+				<el-badge class="mark" v-if="notifylogCount !== 0" :value="notifylogCount" :max="99" style="line-height: 0;margin-top: 8px"/>
 				</span>
 				<div style="float:right;">
 					<el-button type="text" @click="refreshList()">刷新</el-button>
@@ -167,8 +167,8 @@ export default {
 		this.notifyService = new NotifyService()
 	},
 	computed:{
-		backlogCount(){
-			return this.$store.state.global.backlogCount
+		notifylogCount(){
+			return this.$store.state.global.notifylogCount
 		},
 	},
 	mounted() {
@@ -194,7 +194,7 @@ export default {
 				.then((data) => {
 					this.dataList = data.records;
 					this.tablePage.total = data.total;
-					this.$store.state.global.backlogCount = data.total
+					this.$store.state.global.notifylogCount = data.total
 					this.loading = false;
 				});
 		},

src/views/flowable/task/TaskForm.vue

@@ -527,6 +527,12 @@ export default {
 						if (inputForm.days){
 							this.days=inputForm.days
 						}
+						if (inputForm.isPass){
+							this.isPass=inputForm.isPass
+						}
+						if (inputForm.isEmploy){
+							this.isEmploy=inputForm.isEmploy
+						}
 						console.log('this.days', this.days)
 						let assignee = this.auditForm.assignee
 						if (!this.commonJS.isEmpty(inputForm.assignee)) {
@@ -543,6 +549,8 @@ export default {
 								assignee: assignee,
 								recordType: this.recordType,
 								days: this.days,
+								isPass: this.isPass,
+								isEmploy: this.isEmploy,
 							})
 							.then((data) => {
 								this.$message.success("启动成功");
@@ -608,8 +616,8 @@ export default {
 						taskName: ''
 					}
 				}
-				this.$refs.form.reapplyForm((businessTable, businessId, inputForm,recordType) => {
-					vars = {...vars, ...inputForm,recordType}
+				this.$refs.form.reapplyForm((businessTable, businessId, inputForm,recordType,isPass,isEmploy) => {
+					vars = {...vars, ...inputForm,recordType,isPass,isEmploy}
 					if (inputForm.procDefId) {
 						param.procDefId = inputForm.procDefId
 					}
@@ -622,6 +630,12 @@ export default {
 					if (!this.commonJS.isEmpty(inputForm.days)) {
 						this.days=inputForm.days
 					}
+					if (!this.commonJS.isEmpty(inputForm.isPass)) {
+						this.isPass=inputForm.isPass
+					}
+					if (!this.commonJS.isEmpty(inputForm.isEmploy)) {
+						this.isEmploy=inputForm.isEmploy
+					}
 					taskService.audit({
 						taskId: this.taskId,
 						taskDefKey: this.taskDefKey,
@@ -631,7 +645,9 @@ export default {
 						comment: this.auditForm,
 						assignee: assignee,
 						recordType: this.recordType,
-						days: this.days
+						days: this.days,
+						isPass:this.isPass,
+						isEmploy:this.isEmploy,
 					}).then((data) => {
 						this.$message.success('提交成功')
 						this.changeBusiness()
@@ -748,6 +764,7 @@ export default {
 		// Process_1702881896933 嘉溢-入职申请
 		// Process_1702978612585 嘉溢-离职申请
 		// Process_1703038650206 嘉溢-交接申请
+		// Process_1705288955942 嘉溢-转正申请
 
 		// 驳回
 		reject(vars) {
@@ -814,7 +831,8 @@ export default {
 				this.procDefId.includes('Process_1702534302878') ||
 				this.procDefId.includes('Process_1702881896933') ||
 				this.procDefId.includes('Process_1702978612585') ||
-				this.procDefId.includes('Process_1703038650206')
+				this.procDefId.includes('Process_1703038650206') ||
+				this.procDefId.includes('Process_1705288955942')
 			) {
 				console.log('进入新版驳回')
 				this.$confirm(`确定驳回流程吗?`, '提示', {
@@ -1087,7 +1105,10 @@ export default {
 				}
 				// eslint-disable-next-line no-unused-vars
 				this.$refs.form.agreeForm(
-					(businessTable, businessId, inputForm,recordType) => {
+					(businessTable, businessId, inputForm,recordType,isPass,isEmploy) => {
+						console.log('inputForm',inputForm)
+						console.log('inputForm.isPass',inputForm.isPass)
+						console.log('inputForm.isEmploy',inputForm.isEmploy)
 						if (this.commonJS.isNotEmpty(inputForm)) {
 							if (this.commonJS.isNotEmpty(inputForm.assignee)) {
 								this.auditForm.assignee = inputForm.assignee
@@ -1095,8 +1116,16 @@ export default {
 							if (this.commonJS.isNotEmpty(inputForm.days)) {
 								this.days = inputForm.days
 							}
+							if (this.commonJS.isNotEmpty(inputForm.isPass)) {
+								this.isPass = inputForm.isPass
+								console.log('pass',inputForm.isPass)
+							}
+							if (this.commonJS.isNotEmpty(inputForm.isEmploy)) {
+								this.isEmploy = inputForm.isEmploy
+								console.log('isEmploy',inputForm.isEmploy)
+							}
 						}
-						vars = { ...vars, ...inputForm,recordType }
+						vars = { ...vars, ...inputForm,recordType,isPass,isEmploy }
 						taskService
 							.audit({
 								taskId: this.taskId,
@@ -1107,7 +1136,9 @@ export default {
 								comment: this.auditForm,
 								assignee: this.auditForm.assignee,
 								recordType:recordType,
-								days :this.days
+								days :this.days,
+								isPass:isPass,
+								isEmploy:isEmploy,
 							})
 							.then((data) => {
 								this.$message.success("提交成功");
@@ -1397,6 +1428,8 @@ export default {
 			dataListHiCollect: [],
 			recordType:'',
 			days:'',
+			isPass:'',
+			isEmploy:'',
 			companyName:'',
 			refund:[]
 		};

src/views/flowable/task/TaskFormDetail.vue

@@ -163,11 +163,17 @@
 					<vxe-column min-width="160" align="center" title="还款金额" field="refundMoney"></vxe-column>
 					<vxe-column min-width="160" align="center" title="还款人" field="createName"></vxe-column>
 					<vxe-column min-width="160" align="center" title="还款时间" field="createTime"></vxe-column>
+					<vxe-column title="操作" width="150px" fixed="right" align="center">
+						<template  #default="scope">
+							<el-button text type="primary" size="small" @click="hiDetailRefund(scope.row)">还款详情</el-button>
+						</template>
+					</vxe-column>
 				</vxe-table>
 			</el-tab-pane>
 		</el-tabs>
 		<WareHouseHi ref="wareHouseHi"></WareHouseHi>
 		<CollectReturnHi ref="collectReturnHi"></CollectReturnHi>
+		<RefundFormDia ref="refundFormDia"></RefundFormDia>
 	</div>
 </template>
 
@@ -183,6 +189,7 @@ import processService from "@/api/flowable/processService.js";
 import { shallowRef } from 'vue'
 import WareHouseHi from '@/views/materialManagement/wareHouse/WareHouseHi'
 import CollectReturnHi from '@/views/materialManagement/collect/CollectReturnHiForm'
+import RefundFormDia from '@/views/jy/borrowMoney/RefundFormDia'
 import CollectService from '@/api/materialManagement/CollectService'
 import WareHouseService from '@/api/materialManagement/WareHouseService'
 import projectReportService from '@/api/cw/reportManagement/ProjectReportService'
@@ -247,7 +254,8 @@ export default {
 		FlowStep,
 		FlowTimeLine,
 		WareHouseHi,
-		CollectReturnHi
+		CollectReturnHi,
+		RefundFormDia
 		// FlowChart
 	},
 	watch: {
@@ -334,6 +342,13 @@ export default {
 			if (this.commonJS.isNotEmpty(row.id)) {
 				this.$refs.collectReturnHi.init(row.id)
 			}
+		},
+		//打开还款历史详情页
+		hiDetailRefund(row){
+			console.log('row',row)
+			if (this.commonJS.isNotEmpty(row.id)) {
+				this.$refs.refundFormDia.init('view',row.id)
+			}
 		}
 	},
 	data() {

src/views/jy/borrowMoney/BorrowMoneyList.vue

@@ -122,11 +122,11 @@
 					</vxe-column>
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
 						<template  #default="scope">
-							<div >
-								<el-button  size="small" text type="primary" v-if="hasPermission('admin:edit')"  @click="adminEdit(scope.row)">修改</el-button>
-								<el-button text type="primary" size="small" v-if="hasPermission('admin:del')" @click="del(scope.row.id)">删除</el-button>
+							<div v-if="isJyAdmin">
+								<el-button  size="small" text type="primary" v-if="hasPermission('admin:edit') && isJyAdmin "  @click="adminEdit(scope.row)">修改</el-button>
+								<el-button text type="primary" size="small" v-if="hasPermission('admin:del') && isJyAdmin" @click="del(scope.row.id)">删除</el-button>
 							</div>
-							<div>
+							<div v-else>
 								<el-button v-if="hasPermission('borrow:edit')&&(scope.row.status === '0'||scope.row.status === '1'|| scope.row.status === '3')" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
 								<el-button text type="primary" size="small" v-if="hasPermission('borrow:edit')&&(scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3')" @click="del(scope.row.id)">删除</el-button>
 								<!--              当前申请人撤回-->
@@ -207,7 +207,8 @@
 				isAdmin: false,
 				create: '',
 				gridData:[],
-				typeData:[]
+				typeData:[],
+				isJyAdmin:false
 			}
 		},
 		BorrowService:null,
@@ -334,6 +335,7 @@
 					this.loading = false
 				})
 				this.checkIsAdmin()
+				this.checkIsJyAdmin()
 				processService.getByName('嘉溢-借款管理').then((data) => {
 					if (!this.commonJS.isEmpty(data.id)) {
 						this.processDefinitionId = data.id
@@ -347,6 +349,12 @@
 					}
 				})
 			},
+			//判断当前登陆人是否是admin
+			checkIsJyAdmin(){
+				userService.checkIsJyAdmin().then((data)=>{
+					this.isJyAdmin = data
+				})
+			},
 			// 当前页
 			currentChangeHandle ({ currentPage, pageSize }) {
 				this.tablePage.currentPage = currentPage

src/views/jy/borrowMoney/RefundFormDia.vue

@@ -0,0 +1,484 @@
+<template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
+	<div>
+		<el-dialog
+			:title="title"
+			:close-on-click-modal="false"
+			draggable
+			append-to-body
+			width="1300px"
+			@close="close"
+			v-model="visible">
+		<el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail'||method === 'view'"
+				 label-width="160px" @submit.native.prevent>
+			<el-divider content-position="left"><i class="el-icon-document"></i>
+				借款申请
+			</el-divider>
+			<el-row  :gutter="15">
+				<el-col :span="12">
+					<el-form-item label="还款人" prop="createName"
+								  :rules="[]">
+						<el-input :disabled="true" v-model="inputForm.createName"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="还款时间" prop="createTime"
+								  :rules="[]">
+						<el-input :disabled="true" v-model="inputForm.createTime"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="还款金额(小写)" prop="refundLower"
+								  :rules="[{required: true, message:'请输入还款金额(小写)', trigger:'blur'}]">
+						<el-input v-on:input="inputForm.refundLower=inputForm.refundLower.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" @blur="convert(this.inputForm.refundLower)" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" placeholder="请输入还款金额" v-model="inputForm.refundLower" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="还款金额(大写)" prop="refund"
+								  :rules="[]">
+						<el-input :disabled="true" v-model="inputForm.refund"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="剩余借款金额" prop="finalMoney"
+								  :rules="[]">
+						<el-input :disabled="true" v-model="inputForm.finalMoney"></el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+			<template #footer>
+		  <span class="dialog-footer">
+			  <el-button  @click="close()" icon="el-icon-circle-close">关闭</el-button>
+		  </span>
+			</template>
+
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import XEUtils from 'xe-utils'
+	import BorrowService from '@/api/jy/BorrowService'
+	import { ElDatePicker } from 'element-plus';
+	import CommonApi from '@/api/cw/common/CommonApi'
+	export default {
+		props: {
+			businessId: {
+				type: String,
+				default: ''
+			},
+			formReadOnly: {
+				type: Boolean,
+				default: false
+			},
+			status: {
+				type: String,
+				default: ''
+			}
+		},
+		data () {
+			return {
+				title: '',
+				method: '',
+				loading: false,
+				visible:false,
+				inputForm: {
+					id: '',
+					no: '',
+					createById: '',
+					createName: this.$store.state.user.name,
+					createTime: this.moment(new Date()).format('YYYY-MM-DD'),
+					reason: '',
+					refundLower:'', // 还款金额小写
+					moneyLower:'', // 借款金额小写
+					refund:'', //借款金额大写
+					procInsId:'',
+					status:'',
+					finalMoney:'',
+					endMoney:'',
+					refundId:''
+				},
+				baseKey: '',
+				keyWatch: '',
+				dateList:[]
+			}
+		},
+		BorrowService:null,
+		CommonApi:null,
+		created () {
+			console.log('jld ')
+			this.borrowService=new BorrowService()
+			this.commonApi = new CommonApi()
+		},
+		mounted () {
+		},
+		activated () {
+		},
+		components: {
+			ElDatePicker
+		},
+		computed: {
+			bus: {
+				get () {
+					return this.businessId
+				},
+				set (val) {
+					this.businessId = val
+				}
+			}
+		},
+		watch: {
+			'keyWatch': {
+				handler (newVal) {
+					console.log('几里路')
+					if (this.bus) {
+						if (this.bus !== 'false') {
+							this.init('', this.bus)
+						}
+					} else {
+						this.$nextTick(() => {
+							this.$refs.inputForm.resetFields()
+						})
+					}
+				}
+			},
+			'loading': {
+				handler (newVal) {
+					this.$emit('changeLoading', newVal)
+				}
+			}
+		},
+		methods: {
+			getKeyWatch(keyWatch) {
+				this.keyWatch = keyWatch
+			},
+			init(method, id) {
+				this.method = method
+				this.inputForm={
+					id: '',
+					no: '',
+					createById: this.$store.state.user.id,
+					createName: this.$store.state.user.name,
+					createTime: this.moment(new Date()).format('YYYY-MM-DD'),
+					reason: '',
+					refundLower:'', // 还款金额小写
+					refund:'', //还款金额大写
+					procInsId:'',
+					finalMoney:'',
+					moneyLower:'', // 借款金额小写
+					endMoney:'',
+					refundId:''
+				}
+				this.inputForm.id = id
+				this.loading = false
+				this.visible = true
+				this.title = '还款历史详情'
+				this.$nextTick(() => {
+					this.$refs.inputForm.resetFields()
+					this.loading = true
+					if (this.commonJS.isNotEmpty(this.inputForm.id)) {
+						console.log('this.inputForm.id', this.inputForm.id)
+						this.borrowService.findHisById(this.inputForm.id).then((data)=>{
+							this.inputForm = this.recover(this.inputForm, data)
+							console.log('this.inputForm.id', this.inputForm)
+							console.log('data', data)
+							this.inputForm.refundLower = data.refundMoney
+							this.inputForm.finalMoney = data.finalMoney
+							if (this.commonJS.isEmpty(this.inputForm.createName)){
+								this.inputForm.createName=this.$store.state.user.name
+							}
+							if (this.commonJS.isEmpty(this.inputForm.officeName)){
+								this.inputForm.officeName=this.$store.state.user.office.name							}
+							if (this.commonJS.isEmpty(this.inputForm.createTime)){
+								this.inputForm.createTime=this.moment(new Date()).format('YYYY-MM-DD')
+							}
+							if (this.commonJS.isNotEmpty(this.inputForm.refundLower)){
+								this.convert(this.inputForm.refundLower)
+							}
+							this.inputForm.endMoney=data.finalMoney
+							console.log('this.inputForm',this.inputForm)
+						})
+						this.loading = false
+					}
+				})
+			},
+			saveForm(callback) {
+				this.doSubmit('save', callback)
+			},
+			startForm(callback) {
+				this.loading = true
+				if (this.commonJS.isNotEmpty(this.inputForm.id)) {
+					this.borrowService.queryById(this.inputForm.id).then((data) => {
+						if (data.refundStatus !== '0' && data.refundStatus !== '1' && data.refundStatus !== '3' && data.refundStatus !== '5' && data.refundStatus !== '' && data.refundStatus !== null && data.refundStatus !== undefined) { // 审核状态不是“未发起”或“暂存”或“撤回”，就弹出提示
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						} else {
+							this.doSubmit('start', callback)
+						}
+					})
+				} else {
+					this.doSubmit('start', callback)
+				}
+			},
+			async agreeForm(callback) {
+				console.log('进入方法')
+				this.loading = true
+				await this.borrowService.queryById(this.inputForm.id).then((data) => {
+					if (data.refundStatus !== '2' ) { // status的值不等于“审核中”，就弹出提示
+						this.loading = false
+						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+						throw new Error()
+					} else {
+						this.inputForm.status= '5'
+						let param = {status: this.inputForm.status, id: this.inputForm.id}
+						this.borrowService.updateRefundById(param).then(() => {
+							callback(data.businessTable, data.businessId, this.inputForm)
+							this.loading = false
+						}).catch(() => {
+							this.loading = false
+						})
+					}
+				})
+			},
+			reapplyForm(callback) {
+				this.loading = true
+				this.borrowService.queryById(this.inputForm.id).then((data) => {
+					if (data.refundStatus !== '4') { // 审核状态不是“驳回”，就弹出提示
+						this.loading = false
+						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+						throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+					} else {
+						this.doSubmit('reapply', callback)
+					}
+				})
+			},
+			// 表单提交
+			async doSubmit(status, callback) {
+				this.loading = true
+				console.log('5',this.inputForm)
+				if (status === 'save') {
+					// 暂存
+					this.loading = true
+					this.inputForm.status = '1'
+					this.inputForm.createTime=''
+					this.borrowService.saveRefund(this.inputForm).then((data) => {
+						callback(data.businessTable, data.businessId, this.inputForm)
+						this.loading = false
+					}).catch(() => {
+						this.loading = false
+					})
+					return
+				} else if (status === 'start') {
+					if (this.commonJS.isEmpty(this.inputForm.reason)) {
+						this.$message.error('请输入借款用途')
+						this.loading = false
+					}
+					if (this.commonJS.isEmpty(this.inputForm.moneyLower)) {
+						this.$message.error('请输入借款金额')
+						this.loading = false
+					}
+					this.inputForm.createTime=''
+					// 送审  待审核
+					this.inputForm.status = '2'
+				} else if (status === 'agree') {
+					this.inputForm.status= '5'
+				} else if (status === 'reapply') {
+					this.inputForm.status = '2'
+				}
+				this.$refs['inputForm'].validate((valid) => {
+					if (valid) {
+						this.loading = true
+						console.log('form',this.inputForm)
+						this.borrowService.saveRefund(this.inputForm).then((data) => {
+							callback(data.businessTable, data.businessId, this.inputForm)
+							this.$refs.inputForm.resetFields()
+							this.loading = false
+						}).catch(() => {
+							this.$refs.inputForm.resetFields()
+							this.loading = false
+						})
+					} else {
+						this.loading = false
+					}
+				})
+			},
+			close() {
+				this.inputForm = {
+					id:'',
+					projectList:[],
+					name:'',
+					no:'',
+					projectLeader:'',
+					projectCreateDate:'',
+					createById:'',
+					createByName:'',
+					createDate:'',
+					remarks:'',
+					files: [], // 附件信息
+					types:[], //用印类型
+					number:'', //用印份数
+					projectId:'',
+				}
+				this.visible = false
+			},
+			async updateStatusById(type, callback) {
+				this.loading = true
+				if (type === 'reject' || type === 'reback') {
+					this.borrowService.queryById(this.inputForm.id).then((data) => {
+						if (data.refundStatus !== '2') { // status的值不等于“审核中”，就弹出提示
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						} else {
+							// if (type === 'agree') {
+							//   // 同意
+							//   this.inputForm.status = '5'
+							// }
+							if (type === 'reject') {
+								// 驳回
+								this.inputForm.status = '4'
+							}
+							if (type === 'reback') {
+								// 撤回
+								this.inputForm.status = '3'
+							}
+							if (type === 'reject' || type === 'reback') {
+								let param = {status: this.inputForm.status, id: this.inputForm.id}
+								this.borrowService.updateRefundById(param).then(() => {
+									this.loading = false
+									callback()
+								})
+							}
+						}
+					})
+				} else if (type === 'hold') {
+					this.borrowService.queryById(this.inputForm.id).then((data) => {
+						if (data.refundStatus !== '4') { // status的值不等于“驳回”就弹出提示
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						} else {
+							// 终止
+							let param = {status: '1', id: this.inputForm.id}
+							this.borrowService.updateRefundById(param).then(() => {
+								this.loading = false
+								callback()
+							})
+						}
+					})
+				}
+
+			},
+			convert(money){
+				if (!money) {
+					if (this.commonJS.isEmpty(money)){
+						this.inputForm.finalMoney=this.inputForm.endMoney
+					}
+					return this.inputForm.refund='';}
+				//数字的汉字数组
+				let numberCNList = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+				//数字的基础单位汉字数组
+				let numberBaseUnit = ['', '拾', '佰', '仟'];
+				//数字的高级单位汉字数组
+				let numberHighUnit = ['', '万', '亿', '兆'];// 一兆等于一万亿
+				//小数部分单位汉字数组
+				let floatUnit = ['角', '分', '毫', '厘'];
+				//整数金额时后面跟的字符
+				let integerLastCN = '整';
+				//整数后的单位汉字
+				let integerLastUnit = '元';
+				//最大处理的数字
+				let maxNum = 999999999999999.9999;
+				//以小数点拆分金额产生的数组
+				let decimalPointSplitList;
+				//金额整数部分
+				let integerNum;
+				//金额小数部分
+				let decimalNum;
+				//返回的大写金额
+				let moneyCNString = '';
+				money = parseFloat(money);// 转为数字
+				if(typeof money !== 'number' || isNaN(money)){this.$message('检测到非数字字符');return '';}
+				//超出最大处理数字
+				if (money >= maxNum) {this.$message('超出最大处理数字');return '';}
+				// 等于0时 返回零元整
+				if (money === 0) {
+					moneyCNString = numberCNList[0] + integerLastUnit + integerLastCN;
+					return moneyCNString;
+				}
+				//转换为字符串
+				money = money.toString();
+				/******金额数字的处理，转为字符串，判断有没有小数位，获取整数部分和小数部分*******/
+				if (money.indexOf('.') === -1) {// 如果没有小数点
+					integerNum = money;// money就都等于整数部分，小数部分为空
+					decimalNum = '';
+				} else {// 有小数点
+					decimalPointSplitList = money.split('.');// 以小数点拆分数组
+					if(decimalPointSplitList[1].length > 4)this.$message('金额精确仅支持到厘');
+					integerNum = decimalPointSplitList[0];// 整数部分
+					decimalNum = decimalPointSplitList[1].substr(0, 4);// 小数部分只支持4位
+				}
+				/******整数部分处理*******/
+				if (parseInt(integerNum, 10) > 0) {// 以十进制转为int类型 大于零
+					let zeroCount = 0;// 记录零的个数
+					for (let i = 0; i < integerNum.length; i++) {
+						let p = integerNum.length - 1 - i;// 当前数字的位数, 比如10000 ，1的位数是4 ， 10001000，第一个1的位数是7，第二个1的位数是3
+						console.log(p,integerNum[i]);
+						let q = p / 4;// 当前数字位数 除以 4 商0余1，则值为0，控制其高级单位
+						let m = p % 4;// 取余,比如1%4 商0余1 ，则值为1， 控制其基础单位
+						// 如果当前数字等于零 则++
+						if (integerNum[i] === '0') {zeroCount++;}
+						// 否则当前数字不等于零时
+						else {
+							// 如果记录的零的个数大于0 返回结果中加一个汉字零
+							if (zeroCount > 0) {moneyCNString += numberCNList[0];}
+							//把零的个数归零，重新计算零的个数
+							zeroCount = 0;
+							// 然后把返回结果 加上 当前数字的汉字以及其基础单位
+							moneyCNString += numberCNList[parseInt(integerNum[i])] + numberBaseUnit[m];
+						}
+						// 如果当前数字所在位数取余4等于0时，那么除以4一定是整数，并且记录的零的个数小于4个,则拼接当前位数对应的高级单位
+						if (m === 0 && zeroCount < 4) {moneyCNString += numberHighUnit[q];}
+					}
+					moneyCNString += integerLastUnit;// 整数部分结束后 拼接上整数部分单位 元
+				}
+				/******小数部分处理 --- 小数部分只考虑是否有值，以及当前值所在单位，没有零的概念，所以只需拼接当前值对应的汉字，以及当前值的单位即可*******/
+				if (decimalNum !== '') {
+					for (let i = 0; i < decimalNum.length; i++) {
+						if (decimalNum[i] !== '0') {// 如果当前数字不等于零 则加上当前数字的汉字 以及 其小数单位
+							moneyCNString += numberCNList[Number(decimalNum[i])] + floatUnit[i];
+						}
+					}
+				}else {// 如果没有小数部分则加上汉字 整
+					moneyCNString += integerLastCN;
+				}
+
+				this.inputForm.refund= moneyCNString;
+				// this.inputForm.finalMoney=parseFloat(this.inputForm.endMoney-money)
+				// if (this.inputForm.finalMoney <0){
+				// 	this.$message.error("还款金额不正确")
+				// 	throw new Error()
+				// 	this.inputForm.refundLower=''
+				// 	this.inputForm.finalMoney=this.inputForm.endMoney
+				// }
+
+			}
+
+
+		}
+
+	}
+</script>
+<style scoped>
+	/deep/ .el-input-number .el-input__inner {
+		text-align: left;
+	}
+	/deep/ .vxe-footer--row .vxe-footer--column:nth-child(1) .vxe-cell--item {
+		font-weight:700;
+	}
+</style>

src/views/jy/daily/MeetingRoomForm.vue

@@ -392,8 +392,17 @@
 			},
 			//禁用日期
 			disableDate(time) {
-				//Date.now()是javascript中的内置函数，它返回自1970年1月1日00:00:00 UTC以来经过的毫秒数。
-				return time.getTime() < Date.now() - 8.64e7;
+				const now = new Date(); // 获取当前时间
+				const fivePM = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 17, 0, 0); // 设置下午五点的时间
+				// 判断当前时间是否在下午五点之前
+				if (now.getTime() < fivePM.getTime()){
+					//Date.now()是javascript中的内置函数，它返回自1970年1月1日00:00:00 UTC以来经过的毫秒数。
+					return time.getTime() < Date.now() - 8.64e7;
+				}else {
+					return time.getTime() < Date.now()
+				}
+
+
 			},
 			//禁用小时
 			disabledHour(){

src/views/jy/daily/MeetingRoomList.vue

@@ -100,11 +100,11 @@
 					</vxe-column>
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
 						<template  #default="scope">
-							<div >
-								<el-button text type="primary" size="small" v-if="hasPermission('admin:edit')" @click="adminEdit(scope.row.id)">修改</el-button>
-								<el-button text type="primary" size="small" v-if="hasPermission('admin:del')" @click="del(scope.row.id)">删除</el-button>
+							<div v-if="isJyAdmin">
+								<el-button text type="primary" size="small" v-if="hasPermission('admin:edit') && isJyAdmin" @click="adminEdit(scope.row.id)">修改</el-button>
+								<el-button text type="primary" size="small" v-if="hasPermission('admin:del') && isJyAdmin" @click="del(scope.row.id)">删除</el-button>
 							</div>
-							<div >
+							<div v-else>
 								<el-button v-if="hasPermission('jy_meeting:info:edit') && (scope.row.status === '1'|| scope.row.status === '3')" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
 								<el-button text type="primary" size="small" v-if="hasPermission('jy_meeting:info:del') &&(scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3')" @click="del(scope.row.id)">删除</el-button>
 								<!--              当前申请人撤回-->
@@ -173,7 +173,8 @@
 				isAdmin: false,
 				create: '',
 				gridData:[],
-				typeData:[]
+				typeData:[],
+				isJyAdmin:false
 			}
 		},
 		MeetingRoom:null,
@@ -301,6 +302,7 @@
 					this.loading = false
 				})
 				this.checkIsAdmin()
+				this.checkIsJyAdmin()
 				processService.getByName('嘉溢-会议室预约').then((data) => {
 					if (!this.commonJS.isEmpty(data.id)) {
 						this.processDefinitionId = data.id
@@ -308,6 +310,12 @@
 					}
 				})
 			},
+			//判断当前登陆人是否是admin
+			checkIsJyAdmin(){
+				userService.checkIsJyAdmin().then((data)=>{
+					this.isJyAdmin = data
+				})
+			},
 			// 当前页
 			currentChangeHandle ({ currentPage, pageSize }) {
 				this.tablePage.currentPage = currentPage

src/views/jy/drive/DriveApplyForm.vue

@@ -324,9 +324,10 @@
 					})
 					return
 				} else if (status === 'start') {
-					if (this.inputForm.projectList.length ===0) {
-						this.$message.error('请选择用车项目')
+					if (this.commonJS.isEmpty(this.inputForm.projectList)) {
 						this.loading = false
+						this.$message.error('请选择用车项目')
+						throw new Error()
 					}
 					if (this.inputForm.useDate == undefined ||this.inputForm.useDate == null || this.inputForm.useDate.length <= 0 ) {
 						this.$message.error('请选择用车时间')

src/views/jy/drive/DriveList.vue

@@ -99,12 +99,12 @@
 					</vxe-column>
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
 						<template  #default="scope">
-							<div >
+							<div v-if="isJyAdmin">
 <!--								管理员修改-->
-								<el-button v-if="hasPermission('admin:edit')" size="small" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
-								<el-button text type="primary" size="small" v-if="hasPermission('admin:del')" @click="del(scope.row.id)">删除</el-button>
+								<el-button v-if="hasPermission('admin:edit') && isJyAdmin" size="small" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
+								<el-button text type="primary" size="small" v-if="hasPermission('admin:del') && isJyAdmin" @click="del(scope.row.id)">删除</el-button>
 							</div>
-							<div >
+							<div v-else>
 								<el-button v-if="hasPermission('drive:info:edit')&&(scope.row.status === '0'||scope.row.status === '1'|| scope.row.status === '3')" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
 								<el-button text type="primary" size="small" v-if="hasPermission('drive:info:del')&&(scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3')" @click="del(scope.row.id)">删除</el-button>
 								<!--              当前申请人撤回-->
@@ -184,7 +184,8 @@
 				isAdmin: false,
 				create: '',
 				gridData:[],
-				typeData:[]
+				typeData:[],
+				isJyAdmin:false
 			}
 		},
 		DriveService:null,
@@ -311,6 +312,7 @@
 					this.loading = false
 				})
 				this.checkIsAdmin()
+				this.checkIsJyAdmin()
 				processService.getByName('嘉溢-用车申请').then((data) => {
 					if (!this.commonJS.isEmpty(data.id)) {
 						this.processDefinitionId = data.id
@@ -324,6 +326,12 @@
 					}
 				})
 			},
+			//判断当前登陆人是否是admin
+			checkIsJyAdmin(){
+				userService.checkIsJyAdmin().then((data)=>{
+					this.isJyAdmin = data
+				})
+			},
 			// 当前页
 			currentChangeHandle ({ currentPage, pageSize }) {
 				this.tablePage.currentPage = currentPage

src/views/jy/drive/clientUserSelect/UserSelectDialog.vue

@@ -359,7 +359,7 @@
       },
       refreshTree () {
         this.$http({
-          url: `/system-server/sys/office/treeData`,
+          url: `/system-server/sys/office/JyListByUser`,
           method: 'get',
         }).then((data) => {
           this.officeTreeData = data

src/views/jy/driveMaintain/DriveMaintain.vue

@@ -91,11 +91,11 @@
 					</vxe-column>
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
 						<template  #default="scope">
-							<div>
-								<el-button  size="small" text type="primary" v-if="hasPermission('admin:edit')"  @click="adminEdit(scope.row)">修改</el-button>
-								<el-button text type="primary" size="small" v-if="hasPermission('admin:del')" @click="del(scope.row.id)">删除</el-button>
+							<div v-if="isJyAdmin">
+								<el-button  size="small" text type="primary" v-if="hasPermission('admin:edit') && isJyAdmin"  @click="adminEdit(scope.row)">修改</el-button>
+								<el-button text type="primary" size="small" v-if="hasPermission('admin:del') && isJyAdmin" @click="del(scope.row.id)">删除</el-button>
 							</div>
-							<div>
+							<div v-else>
 								<el-button v-if="hasPermission('drive:info:add')&&(scope.row.status === '0'||scope.row.status === '1'|| scope.row.status === '3')" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
 								<el-button text type="primary" size="small" v-if="hasPermission('drive:info:del')&&(scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3')" @click="del(scope.row.id)">删除</el-button>
 								<!--              当前申请人撤回-->
@@ -163,7 +163,8 @@
 				isAdmin: false,
 				create: '',
 				gridData:[],
-				typeData:[]
+				typeData:[],
+				isJyAdmin:false
 			}
 		},
 		DriveMaintainService:null,
@@ -285,6 +286,7 @@
 					this.loading = false
 				})
 				this.checkIsAdmin()
+				this.checkIsJyAdmin()
 				processService.getByName('嘉溢-车辆维护').then((data) => {
 					if (!this.commonJS.isEmpty(data.id)) {
 						this.processDefinitionId = data.id
@@ -292,6 +294,12 @@
 					}
 				})
 			},
+			//判断当前登陆人是否是admin
+			checkIsJyAdmin(){
+				userService.checkIsJyAdmin().then((data)=>{
+					this.isJyAdmin = data
+				})
+			},
 			// 当前页
 			currentChangeHandle ({ currentPage, pageSize }) {
 				this.tablePage.currentPage = currentPage

src/views/jy/evection/EvectionForm.vue

@@ -346,9 +346,10 @@
 					})
 					return
 				} else if (status === 'start') {
-					if (this.inputForm.projectList.length ===0) {
-						this.$message.error('请选择用车项目')
+					if (this.commonJS.isEmpty(this.inputForm.projectList)) {
 						this.loading = false
+						this.$message.error('请选择关联项目')
+						throw new Error()
 					}
 					if (this.inputForm.useDate == undefined ||this.inputForm.useDate == null || this.inputForm.useDate.length <= 0 ) {
 						this.$message.error('请选择用车时间')

src/views/jy/evection/EvectionList.vue

@@ -80,7 +80,7 @@
 					></vxe-button>
 				</template>
 			</vxe-toolbar>
-			<div style="height: calc(100% - 90px)">
+			<div class="jp-table-body">
 				<vxe-table
 					border="inner"
 					auto-resize
@@ -103,6 +103,7 @@
 					@sort-change="sortChangeHandle"
 					:sort-config="{remote:true}"
 					:data="dataList"
+					:tree-config="{}"
 					:checkbox-config="{}">
 					<vxe-column type="seq" width="60" title="序号"></vxe-column>
 					<vxe-column min-width="160" align="center" title="项目" field="projectName">
@@ -122,20 +123,20 @@
 							<el-button @click="detail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.status, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.status, '未登记')}} </el-button>
 						</template>
 					</vxe-column>
-					<vxe-column title="操作" width="150px" fixed="right" align="center">
+					<vxe-column title="操作" min-width="250px" fixed="right" align="center">
 						<template  #default="scope">
-							<div >
-								<el-button v-if="hasPermission('admin:edit')"  size="small" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
-								<el-button text type="primary" size="small" v-if="hasPermission('admin:del')" @click="del(scope.row.id)">删除</el-button>
+							<div v-if="isJyAdmin">
+								<el-button v-if="hasPermission('admin:edit') && isJyAdmin"   text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
+								<el-button text type="primary"  v-if="hasPermission('admin:del') && isJyAdmin" @click="del(scope.row.id)">删除</el-button>
 							</div>
-							<div >
-								<el-button v-if="hasPermission('evection:edit')&&(scope.row.status === '0'||scope.row.status === '1'|| scope.row.status === '3')" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
-								<el-button text type="primary" size="small" v-if="hasPermission('evection:del')&&(scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3')" @click="del(scope.row.id)">删除</el-button>
+							<div v-else>
+								<el-button v-if="hasPermission('evection:edit')&&(scope.row.status === '0'||scope.row.status === '1'|| scope.row.status === '3')"  text type="primary"  @click="edit(scope.row)">修改</el-button>
+								<el-button text type="primary"  v-if="hasPermission('evection:del')&&(scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3')" @click="del(scope.row.id)">删除</el-button>
 								<!--              当前申请人撤回-->
-								<el-button v-if="hasPermission('evection:edit')&&scope.row.createById === $store.state.user.id && scope.row.status==='2'" text type="primary" size="small" @click="reback(scope.row)">撤回</el-button>
+								<el-button v-if="hasPermission('evection:edit')&&scope.row.createById === $store.state.user.id && scope.row.status==='2'" text type="primary"  @click="reback(scope.row)">撤回</el-button>
 
-								<el-button v-if="hasPermission('evection:edit')&&scope.row.status==='2' && checkIsAudit(scope.row)" text type="primary" size="small" @click="examine(scope.row)">审核</el-button>
-								<el-button v-if="hasPermission('evection:edit')&&scope.row.status === '4'&&scope.row.createById === $store.state.user.id" text type="primary" size="small" @click="adjust(scope.row)">驳回调整</el-button>
+								<el-button v-if="hasPermission('evection:edit')&&scope.row.status==='2' && checkIsAudit(scope.row)" text type="primary"  @click="examine(scope.row)">审核</el-button>
+								<el-button v-if="hasPermission('evection:edit')&&scope.row.status === '4'&&scope.row.createById === $store.state.user.id" text type="primary"  @click="adjust(scope.row)">驳回调整</el-button>
 							</div>
 						</template>
 					</vxe-column>
@@ -202,7 +203,8 @@
 				isAdmin: false,
 				create: '',
 				gridData:[],
-				typeData:[]
+				typeData:[],
+				isJyAdmin:false
 			}
 		},
 		EvectionService:null,
@@ -313,6 +315,12 @@
 					this.isAdmin = data
 				})
 			},
+			//判断当前登陆人是否是admin
+			checkIsJyAdmin(){
+				userService.checkIsJyAdmin().then((data)=>{
+					this.isJyAdmin = data
+				})
+			},
 			// 获取数据列表
 			refreshList () {
 				this.loading = true
@@ -329,6 +337,7 @@
 					this.loading = false
 				})
 				this.checkIsAdmin()
+				this.checkIsJyAdmin()
 				processService.getByName('嘉溢-出差申请').then((data) => {
 					if (!this.commonJS.isEmpty(data.id)) {
 						this.processDefinitionId = data.id

src/views/jy/finance/InvoiceList.vue

@@ -257,11 +257,11 @@
           </vxe-column>
           <vxe-column min-width="215" title="操作"  fixed="right" align="center">
             <template  #default="scope">
-              <div >
-                <el-button v-if="hasPermission('admin:edit')" text type="primary"  @click="editForm(scope.row.id)">修改</el-button>
-                <el-button v-if="hasPermission('admin:del')" text type="primary"  @click="del(scope.row.id)">删除</el-button>
+              <div v-if="isJyAdmin">
+                <el-button v-if="hasPermission('admin:edit') && isJyAdmin" text type="primary"  @click="editForm(scope.row.id)">修改</el-button>
+                <el-button v-if="hasPermission('admin:del') && isJyAdmin" text type="primary"  @click="del(scope.row.id)">删除</el-button>
               </div>
-              <div >
+              <div v-else>
               <el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status === '1'||scope.row.status === '3')" text type="primary" @click="invoicePush(scope.row)">修改</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&scope.row.status === '2'" text type="primary"  @click="invoiceReback(scope.row)">撤回</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit:detail')&&scope.row.status === '5'&&scope.row.receivablesStatus !== '1'" text type="primary"  @click="editDetail(scope.row.id)">修改发票明细</el-button>
@@ -377,7 +377,8 @@
         procDefInvalidKey: '',
         isAdmin: false,
 	    financeInvoiceBaseDTOList:[],
-		  recordType:''
+		  recordType:'',
+		  isJyAdmin:false,
       }
     },
     computed: {
@@ -520,6 +521,7 @@
           this.loading = false
         })
         this.checkIsAdmin()
+		  this.checkIsJyAdmin()
         processService.getByName('嘉溢-发票审核').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
@@ -533,6 +535,12 @@
           }
         })
       },
+		//判断当前登陆人是否是admin
+		checkIsJyAdmin(){
+			userService.checkIsJyAdmin().then((data)=>{
+				this.isJyAdmin = data
+			})
+		},
       // 当前页
       currentChangeHandle ({ currentPage, pageSize }) {
         this.tablePage.currentPage = currentPage

src/views/jy/goOut/GoOutForm.vue

@@ -346,9 +346,10 @@
 					})
 					return
 				} else if (status === 'start') {
-					if (this.inputForm.projectList.length ===0) {
-						this.$message.error('请选择用车项目')
+					if (this.commonJS.isEmpty(this.inputForm.projectList)) {
 						this.loading = false
+						this.$message.error('请选择关联项目')
+						throw new Error()
 					}
 					if (this.inputForm.useDate == undefined ||this.inputForm.useDate == null || this.inputForm.useDate.length <= 0 ) {
 						this.$message.error('请选择用车时间')

src/views/jy/goOut/GoOutList.vue

@@ -124,11 +124,11 @@
 					</vxe-column>
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
 						<template  #default="scope">
-							<div >
-								<el-button v-if="hasPermission('admin:edit')"  size="small" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
-								<el-button text type="primary" size="small" v-if="hasPermission('admin:del')" @click="del(scope.row.id)">删除</el-button>
+							<div v-if="isJyAdmin">
+								<el-button v-if="hasPermission('admin:edit') && isJyAdmin"  size="small" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
+								<el-button text type="primary" size="small" v-if="hasPermission('admin:del') && isJyAdmin" @click="del(scope.row.id)">删除</el-button>
 							</div>
-							<div>
+							<div v-else>
 								<el-button v-if="hasPermission('goOut:edit')&&(scope.row.status === '0'||scope.row.status === '1'|| scope.row.status === '3')" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
 								<el-button text type="primary" size="small" v-if="hasPermission('goOut:del')&&(scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3')" @click="del(scope.row.id)">删除</el-button>
 								<!--              当前申请人撤回-->
@@ -202,7 +202,8 @@
 				isAdmin: false,
 				create: '',
 				gridData:[],
-				typeData:[]
+				typeData:[],
+				isJyAdmin:false
 			}
 		},
 		GoOutService:null,
@@ -329,6 +330,7 @@
 					this.loading = false
 				})
 				this.checkIsAdmin()
+				this.checkIsJyAdmin()
 				processService.getByName('嘉溢-外出申请').then((data) => {
 					if (!this.commonJS.isEmpty(data.id)) {
 						this.processDefinitionId = data.id
@@ -336,6 +338,12 @@
 					}
 				})
 			},
+			//判断当前登陆人是否是admin
+			checkIsJyAdmin(){
+				userService.checkIsJyAdmin().then((data)=>{
+					this.isJyAdmin = data
+				})
+			},
 			// 当前页
 			currentChangeHandle ({ currentPage, pageSize }) {
 				this.tablePage.currentPage = currentPage

src/views/jy/holiday/HolidayList.vue

@@ -114,11 +114,11 @@
 					</vxe-column>
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
 						<template  #default="scope">
-							<div >
-								<el-button  size="small" text type="primary" v-if="hasPermission('admin:edit')"  @click="adminEdit(scope.row)">修改</el-button>
-								<el-button text type="primary" size="small" v-if="hasPermission('admin:del')" @click="del(scope.row.id)">删除</el-button>
+							<div v-if="isJyAdmin">
+								<el-button  size="small" text type="primary" v-if="hasPermission('admin:edit') && isJyAdmin"  @click="adminEdit(scope.row)">修改</el-button>
+								<el-button text type="primary" size="small" v-if="hasPermission('admin:del') && isJyAdmin" @click="del(scope.row.id)">删除</el-button>
 							</div>
-							<div >
+							<div v-else>
 								<el-button v-if="hasPermission('holiday:edit')&&(scope.row.status === '0'||scope.row.status === '1'|| scope.row.status === '3')" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
 								<el-button text type="primary" size="small" v-if="hasPermission('holiday:del')&&(scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3')" @click="del(scope.row.id)">删除</el-button>
 								<!--              当前申请人撤回-->
@@ -187,7 +187,8 @@
 				isAdmin: false,
 				create: '',
 				gridData:[],
-				typeData:[]
+				typeData:[],
+				isJyAdmin:false
 			}
 		},
 		HolidayService:null,
@@ -314,6 +315,7 @@
 					this.loading = false
 				})
 				this.checkIsAdmin()
+				this.checkIsJyAdmin()
 				processService.getByName('嘉溢-请假申请').then((data) => {
 					console.log('data',data)
 					if (!this.commonJS.isEmpty(data.id)) {
@@ -322,6 +324,12 @@
 					}
 				})
 			},
+			//判断当前登陆人是否是admin
+			checkIsJyAdmin(){
+				userService.checkIsJyAdmin().then((data)=>{
+					this.isJyAdmin = data
+				})
+			},
 			// 当前页
 			currentChangeHandle ({ currentPage, pageSize }) {
 				this.tablePage.currentPage = currentPage

src/views/jy/humanResources/DimissionList.vue

@@ -102,11 +102,11 @@
 					</vxe-column>
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
 						<template  #default="scope">
-							<div >
+							<div v-if="isJyAdmin">
 								<el-button  size="small" text type="primary" v-if="hasPermission('admin:edit')"  @click="adminEdit(scope.row)">修改</el-button>
 								<el-button text type="primary" size="small" v-if="hasPermission('admin:del')" @click="del(scope.row.id)">删除</el-button>
 							</div>
-							<div >
+							<div v-else>
 <!--								<el-button v-if="hasPermission('dimission:edit') "  size="small" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>-->
 								<el-button v-if="hasPermission('dimission:edit')&&(scope.row.status === '0'||scope.row.status === '1'|| scope.row.status === '3')" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
 								<el-button text type="primary" size="small" v-if="hasPermission('dimission:del') && scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3'" @click="del(scope.row.id)">删除</el-button>

src/views/jy/humanResources/EntryDia.vue

@@ -296,6 +296,13 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
+				<el-col :span="12" v-if="inputForm.onJobStatus === '1'">
+					<el-form-item label="试用期限" prop="timeLimit" :rules="[
+							  {required: true, message:'请填写试用期限', trigger: 'blur'}
+						   ]">
+						<el-input style="width: 93%" v-model="inputForm.timeLimit" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>个月
+					</el-form-item>
+				</el-col>
 						<el-col :span="12">
 							<el-form-item label="入职时间" prop="inTime" :rules="[
                   {required: true, message:'请填写入职时间', trigger: 'blur'}
@@ -422,6 +429,7 @@
 					roleIdList:[],
 					managerOffice:'',
 					procInsId:'',
+					timeLimit:'',
 				},
 				baseKey: '',
 				keyWatch: '',
@@ -547,6 +555,7 @@
 					roleIdList:[],
 					managerOffice:'',
 					procInsId:'',
+					timeLimit:''
 				}
 				this.inputForm.id = id
 				this.loading = false
@@ -622,7 +631,7 @@
 						this.loading = false
 					})
 					roleService.list2({current: 1, size: -1}).then((data) => {
-						this.roleList = data.records
+						this.roleList = data
 					})
 					postService.list2({current: 1, size: -1}).then((data) => {
 						this.postList = data.records

src/views/jy/humanResources/EntryForm.vue

@@ -288,6 +288,13 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
+							<el-col :span="12" v-if="inputForm.onJobStatus === '1'">
+								<el-form-item label="试用期限" prop="timeLimit" :rules="[
+							  {required: true, message:'请填写试用期限', trigger: 'blur'}
+						   ]">
+									<el-input style="width: 95%" v-model="inputForm.timeLimit" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>个月
+								</el-form-item>
+							</el-col>
 						<el-col :span="12">
 							<el-form-item label="入职时间" prop="inTime" :rules="[
                   {required: true, message:'请填写入职时间', trigger: 'blur'}
@@ -408,6 +415,7 @@
 					roleIdList:[],
 					managerOffice:'',
 					procInsId:'',
+					timeLimit:'',
 				},
 				baseKey: '',
 				keyWatch: '',
@@ -533,6 +541,7 @@
 					roleIdList:[],
 					managerOffice:'',
 					procInsId:'',
+					timeLimit:''
 				}
 				this.inputForm.id = id
 				this.loading = false

src/views/jy/humanResources/EntryList.vue

@@ -145,14 +145,21 @@
 							<el-button @click="detail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.type, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.type, '未登记')}} </el-button>
 						</template>
 					</vxe-column>
-					<vxe-column title="操作" width="150px" fixed="right" align="center">
+					<vxe-column  min-width="150px" align="center" title="转正状态" field="type" fixed="right">
+						<template #default="scope">
+							<el-button @click="detailApply(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.applyStatus, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.applyStatus, '未登记')}} </el-button>
+						</template>
+					</vxe-column>
+					<vxe-column title="操作"  min-width="150" fixed="right" align="center">
 						<template  #default="scope">
-							<div >
-								<el-button  size="small" text type="primary" v-if="hasPermission('admin:edit')"  @click="adminEdit(scope.row)">修改</el-button>
-								<el-button text type="primary" size="small" v-if="hasPermission('admin:del')" @click="del(scope.row.id)">删除</el-button>
+							<div v-if="isJyAdmin">
+								<el-button v-if="hasPermission('admin:edit') && isJyAdmin"  size="small" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
+								<el-button text type="primary" size="small" v-if="hasPermission('admin:del') && isJyAdmin" @click="del(scope.row.id)">删除</el-button>
 							</div>
-							<div v-if="isRsb">
+							<div v-else-if="isRsb">
 								<el-button   size="small" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
+								<el-button v-if="scope.row.loginFlag === '1'"   size="small" text type="primary"  @click="updateLoginFlag(scope.row)">冻结</el-button>
+								<el-button v-if="scope.row.loginFlag === '0'"   size="small" text type="primary"  @click="updateLoginFlag1(scope.row)">激活</el-button>
 							</div>
 							<div v-else>
 								<el-button v-if="hasPermission('entry:edit')&&(scope.row.type === '0'||scope.row.type === '1'|| scope.row.type === '3')" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
@@ -162,6 +169,12 @@
 
 								<el-button v-if="hasPermission('entry:edit') && scope.row.type==='2' && checkIsAudit(scope.row)" text type="primary" size="small" @click="examine(scope.row)">审核</el-button>
 								<el-button v-if="hasPermission('entry:edit') && scope.row.type === '4'&&scope.row.createById === $store.state.user.id" text type="primary" size="small" @click="adjust(scope.row)">驳回调整</el-button>
+								<!--转正申请								-->
+								<el-button v-if="hasPermission('entry:edit') && scope.row.type === '5' && scope.row.onJobStatus === '1' &&(scope.row.applyStatus === '0'||scope.row.applyStatus === '1'|| scope.row.applyStatus === '3')" text type="primary" size="small" @click="apply(scope.row)">转正申请</el-button>
+								<el-button v-if="hasPermission('entry:edit') && scope.row.applyStatus==='2'" text type="primary" size="small" @click="rebackApply(scope.row)">撤回</el-button>
+
+								<el-button v-if="hasPermission('entry:edit') && scope.row.applyStatus==='2' && checkIsAudit(scope.row)" text type="primary" size="small" @click="examineApply(scope.row)">审核</el-button>
+								<el-button v-if="hasPermission('entry:edit') && scope.row.applyStatus === '4'" text type="primary" size="small" @click="adjustApply(scope.row)">驳回调整</el-button>
 							</div>
 						</template>
 					</vxe-column>
@@ -223,9 +236,12 @@
 				tableKey: '',
 				loading: false,
 				processDefinitionId: '',
+				processDefinitionIdApply:'',
 				procDefKey: '',
+				procDefKeyApply: '',
 				isAdmin: false,
 				isRsb: false,
+				isJyAdmin:false,
 				create: '',
 				gridData:[],
 				typeData:[]
@@ -354,7 +370,7 @@
 					'orders': this.tablePage.orders,
 					...this.searchForm
 				}).then((data) => {
-					console.log('x',this.$store.state.user)
+					console.log('x',data.records)
 					this.dataList = data.records
 					this.tablePage.total = data.total
 					this.tableKey = Math.random()
@@ -362,6 +378,7 @@
 				})
 				this.checkIsAdmin()
 				this.checkIsRsb()
+				this.checkIsJyAdmin()
 				processService.getByName('嘉溢-入职申请').then((data) => {
 					console.log('data',data)
 					if (!this.commonJS.isEmpty(data.id)) {
@@ -369,6 +386,13 @@
 						this.procDefKey = data.key
 					}
 				})
+				processService.getByName('嘉溢-转正申请').then((data) => {
+					console.log('data',data)
+					if (!this.commonJS.isEmpty(data.id)) {
+						this.processDefinitionIdApply = data.id
+						this.procDefKeyApply = data.key
+					}
+				})
 			},
 			// 当前页
 			currentChangeHandle ({ currentPage, pageSize }) {
@@ -578,6 +602,139 @@
 						}
 					});
 			},
+			updateLoginFlag(row){
+				userService.updateLoginFlag(row.userId).then((data)=>{
+					this.refreshList()
+				})
+			},
+			updateLoginFlag1(row){
+				userService.updateLoginFlag1(row.userId).then((data)=>{
+					this.refreshList()
+				})
+			},
+			checkIsJyAdmin(){
+				userService.checkIsJyAdmin().then((data)=>{
+					this.isJyAdmin = data
+				})
+			},
+			// 修改
+			apply (row) {
+				let tabTitle = `发起流程【嘉溢-转正申请】`
+				let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [嘉溢-转正申请]`
+				taskService.getTaskDef({ procDefId: this.processDefinitionIdApply,
+					businessId: row.applyId,
+					businessTable: 'jy_regular_apply',
+					status: 'startAndHold'}).then((data) => {
+					this.$router.push({
+						path: '/flowable/task/TaskForm',
+						query: {
+							...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+							procDefId: this.processDefinitionIdApply,
+							procDefKey: this.procDefKeyApply,
+							status: 'startAndHold',
+							title: tabTitle,
+							formType: data.formType,
+							formUrl: data.formUrl,
+							formTitle: processTitle,
+							businessId: row.applyId,
+							businessTable: 'jy_regular_apply',
+							isShow: false,
+							routePath: '/jy/humanResources/EntryList'
+						}
+					})
+				})
+			},
+			// 查看修改流程结果
+			detailApply (row) {
+				if (row.applyStatus !== '0' && row.applyStatus !== '1') {
+					this.entryService.queryByApplyId(row.applyId).then((da)=>{
+						// eslint-disable-next-line eqeqeq
+						taskService.getTaskDef({
+							procInsId: row.procInsIdApply,
+							procDefId: this.processDefinitionIdApply
+						}).then((data) => {
+							this.$router.push({
+								path: '/flowable/task/TaskFormDetail',
+								query: {
+									...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+									isShow: 'false',
+									readOnly: true,
+									title: '转正申请' + '流程详情',
+									formTitle: '转正申请' + '流程详情',
+									businessId: row.applyId,
+									status: 'reback',
+									method: 'view'
+								}
+							})
+						})
+					})
+				}
+			},
+			// 撤回入库修改
+			rebackApply (row) {
+				this.$confirm(`确定要撤回该申请吗?`, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					this.entryService.queryByApplyId(row.applyId).then((data) => {
+						if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+							this.$message.error('数据已发生改变或不存在，请刷新数据')
+							this.refreshList()
+						} else {
+							processService.revokeProcIns(row.procInsIdApply).then((data) => {
+								let form = {status: '3', id: row.applyId}
+								this.entryService.updateStatusByApplyId(form)
+								this.$message.success(data)
+								this.refreshList()
+							})
+						}
+					})
+				})
+			},
+			// 驳回后调整
+			adjustApply (row) {
+				this.entryService.queryByApplyId(row.applyId).then((data) => {
+					if (data.status !== '4') { // status的值不等于“驳回”，就弹出提示
+						this.$message.error('数据已发生改变或不存在，请刷新数据')
+						this.refreshList()
+					} else {
+						this.todoApply(row)
+					}
+				})
+			},
+			// 审核
+			examineApply (row) {
+				this.entryService.queryByApplyId(row.applyId).then((data) => {
+					if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+						this.$message.error('数据已发生改变或不存在，请刷新数据')
+						this.refreshList()
+					} else {
+						this.todoApply(row)
+					}
+				})
+			},
+			// 审核或重新调整跳转
+			todoApply (row) {
+				let cUser = false
+				taskService.getTaskDefInfo({
+					taskId: row.taskIdApply
+				}).then((data) => {
+					this.$router.push({
+						path: '/flowable/task/TaskForm',
+						query: {
+							...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId'),
+							isShow: false,
+							formReadOnly: true,
+							formTitle: `${data.taskName}`,
+							cUser: cUser,
+							title: `审批【${data.taskName || ''}】`,
+							routePath: '/jy/humanResources/EntryList',   // 数据处理后需要跳转的页面路径
+						}
+					})
+				})
+			},
+
 
 
 

src/views/jy/humanResources/RegularForm.vue

@@ -0,0 +1,475 @@
+<template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
+	<div>
+		<el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
+				 label-width="160px" @submit.native.prevent>
+			<el-divider content-position="left"><i class="el-icon-document"></i>
+				基本信息
+			</el-divider>
+			<el-row  :gutter="15">
+				<el-col :span="12">
+					<el-form-item label="发起人" prop="createName"
+								  :rules="[
+								]">
+						<el-input v-model="inputForm.createName" placeholder="请填写发起人" readonly="true" disabled="true"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="所属部门" prop="officeName"
+								  :rules="[
+								  ]">
+						<el-input v-model="inputForm.officeName" placeholder="请填写所属部门" readonly="true" disabled="true"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="发起时间" prop="createTime"
+								  :rules="[
+								  ]">
+						<el-date-picker
+							style="width:100%;"
+							v-model="inputForm.createTime"
+							type="date"
+							readonly="true"
+							disabled="true"
+							format="YYYY-MM-DD"
+							value-format="YYYY-MM-DD"
+							placeholder="请选择日期"
+							:size="default"
+							:default-value="new Date()"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="备注" prop="reason"
+								  :rules="[]">
+						<el-input :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="textarea" placeholder="请输入备注"  maxlength="500"  style="width:100%" v-model="inputForm.reason" show-word-limit></el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="15" v-if="status === 'audit' || status === 'taskFormDetail'">
+				<el-col :span="12">
+					<el-form-item label="是否通过" prop="isPass"
+								  :rules="[{required: true, message:'请选择是否通过', trigger:'blur'}
+								]">
+						<el-radio-group v-model="inputForm.isPass" :disabled="!isBmzr && (status === 'audit' || status === 'taskFormDetail') ">
+							<el-radio label="0"  >通过</el-radio> <el-radio label="1" >不通过</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" v-show="inputForm.isPass === '1'">
+					<el-form-item label="是否留用" prop="isEmploy"
+								  :rules="[{required: true, message:'请选择是否留用', trigger:'blur'}
+								]">
+						<el-radio-group v-model="inputForm.isEmploy" :disabled="!isBmzr && (status === 'audit' || status === 'taskFormDetail') ">
+							<el-radio label="0"  >留用</el-radio> <el-radio label="1" >不留用</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" v-show="inputForm.isPass === '1'">
+					<el-form-item label="是否顺延一个月" prop="isPostpone"
+								  :rules="[{required: true, message:'请选择是否留用', trigger:'blur'}
+								]">
+						<el-radio-group v-model="inputForm.isPostpone" :disabled="!isBmzr && (status === 'audit' || status === 'taskFormDetail') ">
+							<el-radio label="0"  >顺延</el-radio> <el-radio label="1" >不顺延</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+<!--		<UpLoadComponent ref="uploadComponent"></UpLoadComponent>-->
+
+	</div>
+</template>
+
+<script>
+	import XEUtils from 'xe-utils'
+	import EntryService from '@/api/jy/EntryService'
+	import { ElDatePicker } from 'element-plus';
+	import UpLoadComponent from '@/views/common/UpLoadComponent'
+	import CommonApi from '@/api/cw/common/CommonApi'
+	import userService from '@/api/sys/userService'
+	export default {
+		props: {
+			businessId: {
+				type: String,
+				default: ''
+			},
+			formReadOnly: {
+				type: Boolean,
+				default: false
+			},
+			status: {
+				type: String,
+				default: ''
+			}
+		},
+		data () {
+			return {
+				title: '',
+				method: '',
+				loading: false,
+				isBmzr:false,
+				inputForm: {
+					createName:this.$store.state.user.name,
+					officeName:this.$store.state.user.office.name,
+					id: '',
+					reason: '',
+					createTime:this.moment(new Date()).format('YYYY-MM-DD'),
+					procInsId: '',
+					isPass:'',
+					isEmploy:'',
+					isPostpone:'',
+				},
+				baseKey: '',
+				keyWatch: '',
+				dateList:[],
+				programRow:'',
+				days:'',
+
+			}
+		},
+		EntryService:null,
+		commonApi: null,
+		created () {
+			this.entryService=new EntryService()
+			this.commonApi = new CommonApi()
+		},
+		mounted () {
+		},
+		activated () {
+		},
+		components: {
+			ElDatePicker,
+			UpLoadComponent,
+		},
+		computed: {
+			bus: {
+				get () {
+					// this.$refs.uploadComponent.setDividerName('附件')
+					return this.businessId
+				},
+				set (val) {
+					this.businessId = val
+				}
+			}
+		},
+		watch: {
+			'keyWatch': {
+				handler (newVal) {
+					console.log('几里路')
+					if (this.bus) {
+						if (this.bus !== 'false') {
+							this.init('', this.bus)
+						}
+					} else {
+						this.$nextTick(() => {
+							this.$refs.inputForm.resetFields()
+						})
+					}
+				}
+			},
+			'loading': {
+				handler (newVal) {
+					this.$emit('changeLoading', newVal)
+					// this.$refs.uploadComponent.changeLoading(newVal)
+				}
+			}
+		},
+		methods: {
+			getKeyWatch(keyWatch) {
+				this.keyWatch = keyWatch
+			},
+			init(method, id) {
+				this.method = method
+				this.inputForm={
+					createName:'',
+					officeName:'',
+					id: '',
+					reason: '',
+					createTime:'',
+					procInsId: '',
+					isPass:'',
+					isEmploy:'',
+					isPostpone:'',
+				}
+				this.inputForm.id = id
+				this.loading = false
+				this.$nextTick(() => {
+					this.$refs.inputForm.resetFields()
+					this.loading = true
+					// this.$refs.uploadComponent.clearUpload()
+					if (this.commonJS.isNotEmpty(this.inputForm.id)) {
+						console.log('this.inputForm.id', this.inputForm.id)
+						this.entryService.queryByApplyId(this.inputForm.id).then((data)=>{
+							this.inputForm = this.recover(this.inputForm, data)
+							console.log('s',this.inputForm)
+							if (this.commonJS.isEmpty(this.inputForm.createName)){
+								this.inputForm.createName = this.$store.state.user.name
+							}
+							if (this.commonJS.isEmpty(this.inputForm.officeName)){
+								this.inputForm.officeName = this.$store.state.user.office.name
+							}
+							if (this.commonJS.isEmpty(this.inputForm.createTime)){
+								this.inputForm.createTime=this.moment(new Date()).format('YYYY-MM-DD')
+							}
+							if (this.status === 'audit' || this.status === 'taskFormDetail') {
+								method = 'view'
+							}
+							console.log('me',method)
+							// this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'jyHoliday',null,null,null,null,null)
+							this.loading = false
+						})
+						userService.isBmzr().then((data)=>{
+							this.isBmzr = data
+						})
+
+					}
+				})
+			},
+			saveForm(callback) {
+				this.doSubmit('save', callback)
+			},
+			startForm(callback) {
+				this.loading = true
+				if (this.commonJS.isNotEmpty(this.inputForm.id)) {
+					this.entryService.queryByApplyId(this.inputForm.id).then((data) => {
+						if (data.status !== '0' && data.status !== '1' && data.status !== '3') { // 审核状态不是“未发起”或“暂存”或“撤回”，就弹出提示
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						} else {
+							this.doSubmit('start', callback)
+						}
+					})
+				} else {
+					this.doSubmit('start', callback)
+				}
+			},
+			async agreeForm(callback) {
+				console.log('进入方法')
+				this.loading = true
+				if (this.commonJS.isEmpty(this.inputForm.isPass)){
+					this.loading = false
+					this.$message.error('请选择是否通过')
+					throw new Error()
+				}else {
+					if (this.inputForm.isPass === '1'){
+						if (this.commonJS.isEmpty(this.inputForm.isEmploy)){
+							this.loading = false
+							this.$message.error('请选择是否留用')
+							throw new Error()
+						}
+						if (this.commonJS.isEmpty(this.inputForm.isPostpone)){
+							this.loading = false
+							this.$message.error('请选择是否顺延')
+							throw new Error()
+						}
+					}
+				}
+				await this.entryService.queryByApplyId(this.inputForm.id).then((data) => {
+					console.log('data',data.status)
+					if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+						if (data.status === '4'){
+							this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((da)=>{
+								if (this.commonJS.isNotEmpty(da)) {
+									if (da === '人事管理员审核') {
+										this.inputForm.status = '5'
+									}
+								}
+								let param = {status: this.inputForm.status, id: this.inputForm.id}
+								this.inputForm=JSON.stringify(this.inputForm)
+								this.entryService.saveApplyForm(this.inputForm).then((item) => {
+									console.log('this.inputForm',this.inputForm)
+									callback(data.businessTable, data.businessId, this.inputForm,'',item.isPass,item.isEmploy)
+									this.loading = false
+								}).catch(() => {
+									this.loading = false
+								})
+							})
+						}else {
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						}
+					} else {
+						this.inputForm.status= '2'
+						if (this.inputForm.isPass ==='0'){
+							this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((da)=>{
+								if (this.commonJS.isNotEmpty(da)) {
+									if (da === '人事管理员审核') {
+										this.inputForm.status = '5'
+									}
+								}
+								let param = {status: this.inputForm.status, id: this.inputForm.id}
+								this.entryService.saveApplyForm(this.inputForm).then((item) => {
+									callback(data.businessTable, data.businessId, this.inputForm,'',item.isPass,item.isEmploy)
+									this.loading = false
+								}).catch(() => {
+									this.loading = false
+								})
+							})
+						}else {
+							if (this.inputForm.isEmploy === '0'){
+								this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((da)=>{
+									if (this.commonJS.isNotEmpty(da)) {
+										if (da === '公司领导审核') {
+											this.inputForm.status = '5'
+										}
+									}
+									let param = {status: this.inputForm.status, id: this.inputForm.id}
+									this.entryService.saveApplyForm(this.inputForm).then((item) => {
+										callback(data.businessTable, data.businessId, this.inputForm,'',item.isPass,item.isEmploy)
+										this.loading = false
+									}).catch(() => {
+										this.loading = false
+									})
+								})
+							}
+
+						}
+
+					}
+				})
+			},
+			reapplyForm(callback) {
+				this.loading = true
+				this.entryService.queryByApplyId(this.inputForm.id).then((data) => {
+					if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示
+						this.loading = false
+						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+						throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+					} else {
+						this.doSubmit('reapply', callback)
+					}
+				})
+			},
+			// 表单提交
+			async doSubmit(status, callback) {
+				this.loading = true
+				console.log('5',this.inputForm)
+				if (status === 'save') {
+					// 暂存
+					this.loading = true
+					this.inputForm.status = '1'
+					// this.inputForm.files = this.$refs.uploadComponent.getDataList()
+					this.entryService.saveApplyForm(this.inputForm).then((data) => {
+						callback(data.businessTable, data.businessId, this.inputForm,data.isPass,data.isEmploy)
+						this.loading = false
+					}).catch(() => {
+						this.loading = false
+					})
+					return
+				} else if (status === 'start') {
+					// this.inputForm.files = this.$refs.uploadComponent.getDataList()
+					// 送审  待审核
+					this.inputForm.status = '2'
+				} else if (status === 'agree') {
+					this.inputForm.status= '5'
+				} else if (status === 'reapply') {
+					this.inputForm.status = '2'
+				}
+				this.$refs['inputForm'].validate((valid) => {
+					if (valid) {
+						this.loading = true
+						console.log('form',this.inputForm)
+						this.entryService.saveApplyForm(this.inputForm).then((data) => {
+							callback(data.businessTable, data.businessId, this.inputForm)
+							this.$refs.inputForm.resetFields()
+							this.loading = false
+						}).catch(() => {
+							this.$refs.inputForm.resetFields()
+							this.loading = false
+						})
+
+					} else {
+						this.loading = false
+					}
+				})
+			},
+			close() {
+				this.inputForm = {
+					id:'',
+					projectList:[],
+					name:'',
+					no:'',
+					projectLeader:'',
+					projectCreateDate:'',
+					createById:'',
+					createByName:'',
+					createDate:'',
+					remarks:'',
+					files: [], // 附件信息
+					types:[], //用印类型
+					number:'', //用印份数
+					projectId:'',
+				}
+				this.visible = false
+			},
+			async updateStatusById(type, callback) {
+				this.loading = true
+				if (type === 'reject' || type === 'reback') {
+					this.entryService.queryByApplyId(this.inputForm.id).then((data) => {
+						if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+							if (data.status === '4'){
+								this.inputForm.status = '4'
+								let param = {status: this.inputForm.status, id: this.inputForm.id}
+								this.entryService.updateStatusByApplyId(param).then(() => {
+									this.loading = false
+									callback()
+								})
+							}
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						} else {
+							// if (type === 'agree') {
+							//   // 同意
+							//   this.inputForm.status = '5'
+							// }
+							if (type === 'reject') {
+								// 驳回
+								this.inputForm.status = '4'
+							}
+							if (type === 'reback') {
+								// 撤回
+								this.inputForm.status = '3'
+							}
+							if (type === 'reject' || type === 'reback') {
+								let param = {status: this.inputForm.status, id: this.inputForm.id}
+								this.entryService.updateStatusByApplyId(param).then(() => {
+									this.loading = false
+									callback()
+								})
+							}
+						}
+					})
+				} else if (type === 'hold') {
+					this.entryService.queryByApplyId(this.inputForm.id).then((data) => {
+						if (data.status !== '4') { // status的值不等于“驳回”就弹出提示
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						} else {
+							// 终止
+							let param = {status: '1', id: this.inputForm.id}
+							this.entryService.saveApplyForm(this.inputForm).then(() => {
+								this.loading = false
+								callback(data.businessTable, data.businessId, this.inputForm)
+							})
+						}
+					})
+				}
+
+			},
+
+		}
+
+	}
+</script>
+<style scoped>
+	/deep/ .el-input-number .el-input__inner {
+		text-align: left;
+	}
+	/deep/ .vxe-footer--row .vxe-footer--column:nth-child(1) .vxe-cell--item {
+		font-weight:700;
+	}
+</style>

src/views/jy/inscription/InscriptionList.vue

@@ -100,11 +100,11 @@
 					</vxe-column>
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
 						<template  #default="scope">
-							<div >
-								<el-button  size="small" text type="primary" v-if="hasPermission('admin:edit')"  @click="adminEdit(scope.row)">修改</el-button>
-								<el-button text type="primary" size="small" v-if="hasPermission('admin:del')" @click="del(scope.row.id)">删除</el-button>
+							<div v-if="isJyAdmin">
+								<el-button  size="small" text type="primary" v-if="hasPermission('admin:edit') && isJyAdmin"  @click="adminEdit(scope.row)">修改</el-button>
+								<el-button text type="primary" size="small" v-if="hasPermission('admin:del') && isJyAdmin" @click="del(scope.row.id)">删除</el-button>
 							</div>
-							<div >
+							<div v-else>
 								<el-button v-if="hasPermission('inscription:edit')&&(scope.row.status === '0'||scope.row.status === '1'|| scope.row.status === '3')" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
 								<el-button text type="primary" size="small" v-if="hasPermission('inscription:del')&&(scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3')" @click="del(scope.row.id)">删除</el-button>
 								<!--              当前申请人撤回-->
@@ -177,7 +177,8 @@
 				isAdmin: false,
 				create: '',
 				gridData:[],
-				typeData:[]
+				typeData:[],
+				isJyAdmin:false
 			}
 		},
 		InscriptionService:null,
@@ -303,6 +304,7 @@
 					this.loading = false
 				})
 				this.checkIsAdmin()
+				this.checkIsJyAdmin()
 				processService.getByName('嘉溢-文印申请').then((data) => {
 					if (!this.commonJS.isEmpty(data.id)) {
 						this.processDefinitionId = data.id
@@ -310,6 +312,12 @@
 					}
 				})
 			},
+			//判断当前登陆人是否是admin
+			checkIsJyAdmin(){
+				userService.checkIsJyAdmin().then((data)=>{
+					this.isJyAdmin = data
+				})
+			},
 			// 当前页
 			currentChangeHandle ({ currentPage, pageSize }) {
 				this.tablePage.currentPage = currentPage

src/views/jy/monthly/MonthlyList.vue

@@ -93,11 +93,11 @@
 					<vxe-column min-width="160" align="center" title="申请时间" field="createTime"></vxe-column>
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
 						<template  #default="scope">
-							<div >
-								<el-button  size="small" text type="primary" v-if="hasPermission('admin:edit')"  @click="adminEdit(scope.row)">修改</el-button>
-								<el-button text type="primary" size="small" v-if="hasPermission('admin:del')" @click="del(scope.row.id)">删除</el-button>
+							<div v-if="isJyAdmin">
+								<el-button  size="small" text type="primary" v-if="hasPermission('admin:edit') && isJyAdmin"  @click="adminEdit(scope.row)">修改</el-button>
+								<el-button text type="primary" size="small" v-if="hasPermission('admin:del') && isJyAdmin" @click="del(scope.row.id)">删除</el-button>
 							</div>
-							<div >
+							<div v-else>
 								<el-button  size="small" text type="primary" v-if="hasPermission('monthly:edit')"  @click="edit(scope.row)">修改</el-button>
 								<el-button text type="primary" size="small" v-if="hasPermission('monthly:del')"  @click="del(scope.row.id)">删除</el-button>
 							</div>
@@ -164,7 +164,8 @@
 				isAdmin: false,
 				create: '',
 				gridData:[],
-				typeData:[]
+				typeData:[],
+				isJyAdmin:false
 			}
 		},
 		MonthlyService:null,
@@ -245,6 +246,7 @@
 					this.loading = false
 				})
 				this.checkIsAdmin()
+				this.checkIsJyAdmin()
 				processService.getByName('嘉溢-文印申请').then((data) => {
 					if (!this.commonJS.isEmpty(data.id)) {
 						this.processDefinitionId = data.id
@@ -252,6 +254,12 @@
 					}
 				})
 			},
+			//判断当前登陆人是否是admin
+			checkIsJyAdmin(){
+				userService.checkIsJyAdmin().then((data)=>{
+					this.isJyAdmin = data
+				})
+			},
 			// 当前页
 			currentChangeHandle ({ currentPage, pageSize }) {
 				this.tablePage.currentPage = currentPage

src/views/jy/notify/NotifyList.vue

@@ -104,7 +104,7 @@
                  </span>
               </template>
             </vxe-column>
-             <vxe-column  min-width="100px" title="发布者" field="createBy.name" align="center" ></vxe-column>
+             <vxe-column  min-width="100px" title="发布者" field="createName" align="center" ></vxe-column>
 <!--            <vxe-column min-width="180px" title="通告时间" field="beginDate" align="center" >-->
 <!--              <template  #default="scope">-->
 <!--                 <span v-if="scope.row.notifyType === '0'">-->
@@ -137,13 +137,13 @@
                   <el-button v-if="hasPermission('jy_notify:info:edit')&&(scope.row.status === '4')&&scope.row.createById === $store.state.user.id" text type="primary" size="small" @click="push(scope.row)">驳回调整</el-button>
                   <el-button v-if="hasPermission('jy_notify:info:edit')&&(scope.row.status === '1' || scope.row.status === '3')&& (scope.row.createById === $store.state.user.id )" text type="primary" size="small" @click="edit(scope.row)">修改</el-button>
 <!--					管理员修改-->
-                  <el-button v-if="hasPermission('admin:edit')" text type="primary" size="small" @click="adminEdit(scope.row.id)">修改</el-button>
+                  <el-button v-if="hasPermission('admin:edit') && isJyAdmin" text type="primary" size="small" @click="adminEdit(scope.row.id)">修改</el-button>
                   <el-button v-if="hasPermission('jy_notify:info:edit')&&scope.row.status === '5' && scope.row.isClose === '0' && (scope.row.createById === $store.state.user.id || isAdmin)" text type="primary" size="small" @click="close(scope.row.id)">关闭</el-button>
 
                   <el-button v-if="hasPermission('jy_notify:info:edit')&&(scope.row.status === '2')&&scope.row.createById === $store.state.user.id" text type="primary" size="small" @click="reback(scope.row)">撤回</el-button>
                   <el-button v-if="hasPermission('jy_notify:info:del')&&(scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3')&&(scope.row.createById === $store.state.user.id || isAdmin)"  text type="primary" size="small" @click="del(scope.row.id)">删除</el-button>
 <!--					管理员删除-->
-                  <el-button v-if="hasPermission('admin:del')"  text type="primary" size="small" @click="del(scope.row.id)">删除</el-button>
+                  <el-button v-if="hasPermission('admin:del') && isJyAdmin"  text type="primary" size="small" @click="del(scope.row.id)">删除</el-button>
 				</template>
             </vxe-column>
         </vxe-table>
@@ -196,7 +196,8 @@
         loading: false,
         processDefinitionAuditId: '',
         procDefAuditKey: '',
-        isAdmin: false
+        isAdmin: false,
+		  isJyAdmin:false
       }
     },
     components: {
@@ -254,6 +255,7 @@
           this.tablePage.total = data.total
           this.loading = false
           this.checkIsAdmin()
+			this.checkIsJyAdmin()
           processService.getByName('嘉溢-发起通知').then((data) => {
             if (!this.commonJS.isEmpty(data.id)) {
               this.processDefinitionAuditId = data.id
@@ -268,6 +270,12 @@
           this.isAdmin = data
         })
       },
+		//判断当前登陆人是否是admin
+		checkIsJyAdmin(){
+			userService.checkIsJyAdmin().then((data)=>{
+				this.isJyAdmin = data
+			})
+		},
   // 当前页
       currentChangeHandle ({ currentPage, pageSize }) {
         this.tablePage.currentPage = currentPage

src/views/jy/notify/NotifyTaskForm.vue

@@ -319,6 +319,7 @@
             this.$refs.uploadComponent.clearUpload()
             this.inputForm = this.recover(this.inputForm, data)
             this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+			  this.inputForm.createBy.id = data.createById
 			  console.log('inputForm',this.inputForm)
 			  this.inputForm.pageSize=3
             if (this.status === 'audit' || this.status === 'taskFormDetail') {
@@ -335,7 +336,10 @@
             if (this.commonJS.isEmpty(this.inputForm.createBy.id)) {
               this.inputForm.createBy.id = this.$store.state.user.id
               this.inputForm.createBy.name = this.$store.state.user.name
-            }
+            }else {
+				this.inputForm.createBy.id = data.createById
+				this.inputForm.createBy.name = data.createName
+			}
             if (this.commonJS.isEmpty(this.inputForm.officeId)) {
               this.inputForm.officeId = this.$store.state.user.office.id
             }

src/views/jy/payment/PaymentForm.vue

@@ -440,8 +440,9 @@
 					return
 				} else if (status === 'start') {
 					if (this.commonJS.isEmpty(this.inputForm.projectDTOList)) {
-						this.$message.error('请选择项目')
 						this.loading = false
+						this.$message.error('请选择项目')
+						throw new Error()
 					}
 					if (this.commonJS.isEmpty(this.inputForm.proceedOfficeName)) {
 						this.$message.error('请选择收款单位')

src/views/jy/payment/PaymentList.vue

@@ -115,11 +115,11 @@
 					</vxe-column>
 					<vxe-column title="操作" width="150px" fixed="right" align="center">
 						<template  #default="scope">
-							<div >
-								<el-button  size="small" text type="primary" v-if="hasPermission('admin:edit')"  @click="adminEdit(scope.row)">修改</el-button>
-								<el-button text type="primary" size="small" v-if="hasPermission('admin:del')">删除</el-button>
+							<div v-if="isJyAdmin">
+								<el-button  size="small" text type="primary" v-if="hasPermission('admin:edit') && isJyAdmin"  @click="adminEdit(scope.row)">修改</el-button>
+								<el-button text type="primary" size="small" v-if="hasPermission('admin:del') && isJyAdmin">删除</el-button>
 							</div>
-							<div >
+							<div v-else>
 								<el-button v-if="hasPermission('payment:edit') &&(scope.row.status === '0'||scope.row.status === '1'|| scope.row.status === '3')" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
 								<el-button text type="primary" size="small" v-if="hasPermission('payment:del') &&scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3'" @click="del(scope.row.id)">删除</el-button>
 								<!--              当前申请人撤回-->
@@ -193,7 +193,8 @@
 				isAdmin: false,
 				create: '',
 				gridData:[],
-				typeData:[]
+				typeData:[],
+				isJyAdmin:false
 			}
 		},
 		PaymentService:null,
@@ -320,6 +321,7 @@
 					this.loading = false
 				})
 				this.checkIsAdmin()
+				this.checkIsJyAdmin()
 				processService.getByName('嘉溢-付款管理').then((data) => {
 					if (!this.commonJS.isEmpty(data.id)) {
 						this.processDefinitionId = data.id
@@ -327,6 +329,12 @@
 					}
 				})
 			},
+			//判断当前登陆人是否是admin
+			checkIsJyAdmin(){
+				userService.checkIsJyAdmin().then((data)=>{
+					this.isJyAdmin = data
+				})
+			},
 			// 当前页
 			currentChangeHandle ({ currentPage, pageSize }) {
 				this.tablePage.currentPage = currentPage

src/views/jy/project/ContractForm.vue

@@ -12,8 +12,8 @@
       <div style="height: calc(100% - 80px);">
         <el-form :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
           <!-- 搜索框-->
-          <el-form-item label="合同名称" prop="contractName">
-            <el-input v-model="searchForm.contractName" placeholder="请输入合同名称" clearable></el-input>
+          <el-form-item label="合同名称" prop="name">
+            <el-input v-model="searchForm.name" placeholder="请输入合同名称" clearable></el-input>
           </el-form-item>
           <el-form-item label="委托方" prop="primaryLinkman">
             <el-input v-model="searchForm.primaryLinkman" placeholder="请输入委托方" clearable></el-input>
@@ -96,6 +96,7 @@
   import InputNumber from '@/views/workContract/InputNumber.vue'
   import SelectUserTree from '@/views/utils/treeUserSelect'
   import ProjectInfoService from "@/api/jy/ProjectInfoService";
+  import WorkContractService from '@/api/jy/WorkContractService'
   export default {
     data () {
       return {
@@ -112,7 +113,7 @@
         dataList: [],
         searchForm: {
           primaryLinkman: '',
-			contractName: '',
+			name: '',
           contractDates: [],
           type: '',
           contractType: '',
@@ -124,8 +125,10 @@
       }
     },
 	  ProjectInfoService: null,
+	  workContractService: null,
     created () {
       this.projectInfoService = new ProjectInfoService()
+		this.workContractService = new WorkContractService()
     },
     components: {
       SelectUserTree,
@@ -152,7 +155,7 @@
       list () {
         this.loading = true
         this.searchForm.createBy = this.$store.state.user.id
-        this.projectInfoService.findContractPageList({
+		  this.workContractService.list({
           'current': this.tablePage.currentPage,
           'size': this.tablePage.pageSize,
           'orders': this.tablePage.orders,

src/views/jy/project/ProjectAuditForm.vue

@@ -18,35 +18,35 @@
 					<el-form-item label="合同名称" prop="contractName"
 								  :rules="[
 			 ]">
-						<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" v-model="inputForm.contractName" placeholder="请填写合同名称"></el-input>
+						<el-input :disabled="true" v-model="inputForm.contractName" placeholder="请填写合同名称"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="合同金额(元)" prop="contractAmount"
 								  :rules="[
 			 ]">
-						  <el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" v-model="inputForm.contractAmount" placeholder="请填写合同金额(元)"></el-input>
+						  <el-input :disabled="true" v-model="inputForm.contractAmount" placeholder="请填写合同金额(元)"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="委托方" prop="primaryLinkman"
 								  :rules="[
 			 ]">
-						<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" v-model="inputForm.primaryLinkman" placeholder="请填写委托方"></el-input>
+						<el-input :disabled="true" v-model="inputForm.primaryLinkman" placeholder="请填写委托方"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="合同类型(大类)" prop="contractTypeFirst"
 								  :rules="[
 			 ]">
-						<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" v-model="inputForm.contractTypeFirst" placeholder="请填写合同类型(大类)"></el-input>
+						<el-input :disabled="true" v-model="inputForm.contractTypeFirst" placeholder="请填写合同类型(大类)"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="合同类型(小类)" prop="contractType"
 								  :rules="[
 			 ]">
-						<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" v-model="inputForm.contractType" placeholder="请填写合同类型(小类)"></el-input>
+						<el-input :disabled="true" v-model="inputForm.contractType" placeholder="请填写合同类型(小类)"></el-input>
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -60,42 +60,42 @@
 					<el-form-item label="项目名称" prop="projectName"
 								  :rules="[
 			 ]">
-						<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" v-model="inputForm.projectName" placeholder="请填写项目名称"></el-input>
+						<el-input :disabled="true" v-model="inputForm.projectName" placeholder="请填写项目名称"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="项目所在地" prop="projectPlace"
 								  :rules="[
 			 ]">
-						  <el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" v-model="inputForm.projectPlace" placeholder="请填写项目所在地"></el-input>
+						  <el-input :disabled="true" v-model="inputForm.projectPlace" placeholder="请填写项目所在地"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="建设地点" prop="buildPlace"
 								  :rules="[
 			 ]">
-						<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" v-model="inputForm.buildPlace" placeholder="请填写建设地点"></el-input>
+						<el-input :disabled="true" v-model="inputForm.buildPlace" placeholder="请填写建设地点"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="项目负责人" prop="projectLeader"
 								  :rules="[
 			 ]">
-						<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" v-model="inputForm.projectLeader" placeholder="请填写项目负责人"></el-input>
+						<el-input :disabled="true" v-model="inputForm.projectLeader" placeholder="请填写项目负责人"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="创建人" prop="createByName"
 								  :rules="[
 			 ]">
-						<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" v-model="inputForm.createByName" placeholder="请填写创建人"></el-input>
+						<el-input :disabled="true" v-model="inputForm.createByName" placeholder="请填写创建人"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="创建时间" prop="createTime"
 								  :rules="[
 			 ]">
-						<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'" v-model="inputForm.createTime" placeholder="请填写创建时间"></el-input>
+						<el-input :disabled="true" v-model="inputForm.createTime" placeholder="请填写创建时间"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12" >

src/views/jy/project/ProjectList.vue

@@ -227,7 +227,7 @@
 						<template  #default="scope">
 							<el-button v-if="hasPermission('jy_project:info:edit')&&(scope.row.status === '1' || scope.row.status === '3')&&scope.row.createBy === $store.state.user.id" text type="primary"  @click="registeredPush(scope.row)">修改</el-button>
 							<!--管理员角色登记完成后可修改-->
-							<el-button v-if="hasPermission('admin:edit')" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
+							<el-button v-if="hasPermission('admin:edit') && isJyAdmin" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
 							<!--项目负责人修改-->
 							<el-button v-if="hasPermission('jy_project:info:edit')&&scope.row.status === '5' && (scope.row.projectLeader === $store.state.user.name || (haveProjectIds.includes(scope.row.id) && scope.row.createBy !== $store.state.user.id))" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
 							<el-button v-if="hasPermission('jy_project:info:edit')&&scope.row.status === '2'&&scope.row.createBy === $store.state.user.id" text type="primary"  @click="registeredReback(scope.row)">撤回</el-button>
@@ -238,7 +238,7 @@
 
 							<el-button v-if="hasPermission('jy_project:info:del')&&(scope.row.status === '1' || scope.row.status === '3')&&(scope.row.createBy === $store.state.user.id  ||haveProjectIds.includes(scope.row.id))" text type="primary"  @click="del(scope.row.id)">删除</el-button>
 							<!--管理员角色登记完成后可删除-->
-							<el-button v-if="hasPermission('admin:del')" text type="primary"  @click="del(scope.row.id)">删除</el-button>
+							<el-button v-if="hasPermission('admin:del') && isJyAdmin" text type="primary"  @click="del(scope.row.id)">删除</el-button>
 
 							<!--              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && commonJS.isEmpty(scope.row.reportNo) && scope.row.createBy === $store.state.user.id" text type="primary"  @click="saveReportNo(scope.row.id)">生成报告号</el-button>-->
 
@@ -407,6 +407,7 @@ export default {
 			procDefKeyArchive:'',
 			processDefinitionIdEia:'',
 			procDefKeyEia:'',
+			isJyAdmin:false,
 		}
 	},
 	ProjectInfoService:null,
@@ -469,6 +470,12 @@ export default {
 		view (row) {
 			this.$refs.projectDia.init('view', row.id,row.auditId1, row.auditId2, row.auditId3,row.sealId,row.outInstanceId,row.reportsSubmitId,row.archiveId,row.eiaId)
 		},
+		//判断当前登陆人是否是admin
+		checkIsJyAdmin(){
+			userService.checkIsJyAdmin().then((data)=>{
+				this.isJyAdmin = data
+			})
+		},
 		// 获取数据列表
 		refreshList () {
 			this.loading = true
@@ -485,6 +492,7 @@ export default {
 				this.loading = false
 			})
 			this.is()
+			this.checkIsJyAdmin()
 			// 获取当前登录人的所属项目id集合
 			this.projectInfoService.getHaveProjectIds().then((data) => {
 				if (this.commonJS.isNotEmpty(data)) {

src/views/jy/reimbursement/ReimbursementForm.vue

@@ -103,9 +103,9 @@
 									<el-input v-model="scope.row.projectName" @focus="openBorrowForm(scope.$rowIndex, scope.row)"></el-input>
 								</template>
 							</vxe-table-column>
-							<vxe-table-column field="moneyLower" title="借款金额(元)" :edit-render="{}" :rules="[]">
+							<vxe-table-column field="finalMoney" title="借款金额(元)" :edit-render="{}" :rules="[]">
 								<template v-slot:edit="scope">
-									<el-input :disabled='true' v-model="scope.row.moneyLower"></el-input>
+									<el-input :disabled='true' v-model="scope.row.finalMoney"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column field="number" title="费用(元)" :edit-render="{}" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
@@ -1014,7 +1014,7 @@
 				if (this.commonJS.isNotEmpty(rows)) {
 					this.inputForm.infoborrows[this.indexRow].projectId = rows.id
 					this.inputForm.infoborrows[this.indexRow].projectName = rows.reason
-					this.inputForm.infoborrows[this.indexRow].moneyLower = rows.moneyLower
+					this.inputForm.infoborrows[this.indexRow].finalMoney = rows.finalMoney
 				}
 				this.indexRow = ''
 				this.$forceUpdate()

src/views/jy/reimbursement/ReimbursementList.vue

@@ -158,11 +158,11 @@
 
 					<vxe-column title="操作" min-width="130px" fixed="right" align="center">
 						<template  #default="scope">
-							<div >
-								<el-button v-if="hasPermission('admin:edit')" text type="primary" @click="editForm(scope.row)">修改</el-button>
-								<el-button v-if=" hasPermission('admin:del')" text type="primary"  @click="del(scope.row.id)">删除</el-button>
+							<div v-if="isJyAdmin">
+								<el-button v-if="hasPermission('admin:edit') && isJyAdmin" text type="primary" @click="editForm(scope.row)">修改</el-button>
+								<el-button v-if=" hasPermission('admin:del') && isJyAdmin" text type="primary"  @click="del(scope.row.id)">删除</el-button>
 							</div>
-							<div >
+							<div v-else>
 								<el-button v-if="hasPermission('apply:edit') && scope.row.createById === $store.state.user.id && (scope.row.status === '1' || scope.row.status === '3' )" text type="primary"   @click="edit(scope.row)">修改</el-button>
 								<el-button v-if="hasPermission('apply:edit') && scope.row.createById === $store.state.user.id && (scope.row.status === '2')" text type="primary"  @click="reback(scope.row)">撤回</el-button>
 								<el-button v-if="hasPermission('apply:del') && scope.row.createById === $store.state.user.id && (scope.row.status === '1')" text type="primary"  @click="del(scope.row.id)">删除</el-button>
@@ -231,7 +231,8 @@
 					orders: []
 				},
 				loading: false,
-				isAdmin: false
+				isAdmin: false,
+				isJyAdmin:false
 			}
 		},
 		ReimbursementService: null,
@@ -395,6 +396,7 @@
 					this.loading = false
 				})
 				this.checkIsAdmin()
+				this.checkIsJyAdmin()
 				processService.getByName('嘉溢-报销管理').then((data) => {
 					if (!this.commonJS.isEmpty(data.id)) {
 						this.processDefinitionId = data.id
@@ -402,6 +404,12 @@
 					}
 				})
 			},
+			//判断当前登陆人是否是admin
+			checkIsJyAdmin(){
+				userService.checkIsJyAdmin().then((data)=>{
+					this.isJyAdmin = data
+				})
+			},
 			// 删除
 			del (id) {
 				let ids = id || this.$refs.infoTable.getCheckboxRecords().map(item => {

src/views/jy/workContractInfo/JyWorkContractList.vue

@@ -150,7 +150,7 @@
 								<!--归档暂存修改-->
 								<el-button v-if="hasPermission('jy_work_contract:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.filedType === '0' || scope.row.filedType === '1' ||scope.row.filedType === '3')" text type="primary"  @click="updateFiled(scope.row)">修改</el-button>
 								<!--管理员修改-->
-								<el-button v-if="hasPermission('admin:edit')" text type="primary"  @click="editForm(scope.row)">修改</el-button>
+								<el-button v-if="hasPermission('admin:edit') && isJyAdmin" text type="primary"  @click="editForm(scope.row)">修改</el-button>
 								<!--归档撤回-->
 								<el-button v-if="hasPermission('jy_work_contract:info:back') && scope.row.filedType === '2'  && scope.row.createId === $store.state.user.id" text type="primary"   @click="rebackFiled(scope.row)">撤回</el-button>
 								<!--              合同归档  审核-->
@@ -160,7 +160,7 @@
 								<!--							删除-->
 								<el-button v-if="hasPermission('jy_work_contract:info:del')&&(scope.row.filedType === '0' || scope.row.filedType === '1' || scope.row.filedType === '3') &&scope.row.createId === $store.state.user.id" text type="primary"  @click="deleteById(scope.row.id)">删除</el-button>
 								<!--							管理员删除-->
-								<el-button v-if="hasPermission('admin:del')" text type="primary"  @click="deleteById(scope.row.id)">删除</el-button>
+								<el-button v-if="hasPermission('admin:del') && isJyAdmin" text type="primary"  @click="deleteById(scope.row.id)">删除</el-button>
 							</div>
 							</template>
 					</vxe-column>
@@ -232,7 +232,8 @@
 				create: '',
 				isAdmin: false,
 				applyUserName: '',
-				taskId:''
+				taskId:'',
+				isJyAdmin:false
 			}
 		},
 		workContractService: null,
@@ -305,6 +306,7 @@
 					this.tablePage.total = data.total
 					this.loading = false
 				})
+				this.checkIsJyAdmin()
 				processService.getByName('嘉溢-合同归档').then((data) => {
 					if (!this.commonJS.isEmpty(data.id)) {
 						this.processDefinitionId = data.id
@@ -312,6 +314,12 @@
 					}
 				})
 			},
+			//判断当前登陆人是否是admin
+			checkIsJyAdmin(){
+				userService.checkIsJyAdmin().then((data)=>{
+					this.isJyAdmin = data
+				})
+			},
 			// 当前页
 			currentChangeHandle ({currentPage, pageSize}) {
 				this.tablePage.currentPage = currentPage

src/views/materialManagement/userSeal/SignetAddForm.vue

@@ -347,8 +347,9 @@
 					return
 				} else if (status === 'start') {
 					if (this.commonJS.isEmpty(this.inputForm.projectList)) {
-						this.$message.error('请选择关联项目')
 						this.loading = false
+						this.$message.error('请选择关联项目')
+						throw new Error()
 					}
 					if (this.commonJS.isEmpty(this.inputForm.types)) {
 						this.$message.error('请选择用印类型')
@@ -378,9 +379,9 @@
 						this.loading = true
 						this.inputForm.files = this.$refs.uploadComponent.getDataList()
 						this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
-						// if (this.commonJS.isNotEmpty(this.inputForm.no)){
-						// 	this.inputForm.types=[]
-						// }
+						if (this.commonJS.isNotEmpty(this.inputForm.no)){
+							this.inputForm.types=[]
+						}
 						this.signetService.saveForm(this.inputForm).then((data) => {
 							this.inputForm.id = data.businessId
 							let name = this.inputForm.projectName.substring(0,this.inputForm.projectName.lastIndexOf(","))

src/views/materialManagement/userSeal/SignetList.vue

@@ -109,8 +109,8 @@
 <!--              </div>-->
               <div>
 <!--					管理员删除-->
-				  <el-button text type="primary" size="small" v-if="hasPermission('admin:edit')" @click="adminEdit(scope.row.id)">修改</el-button>
-				  <el-button text type="primary" size="small" v-if="hasPermission('admin:del')" @click="del(scope.row.id)">删除</el-button>
+				  <el-button text type="primary" size="small" v-if="hasPermission('admin:edit') && isJyAdmin" @click="adminEdit(scope.row.id)">修改</el-button>
+				  <el-button text type="primary" size="small" v-if="hasPermission('admin:del') && isJyAdmin" @click="del(scope.row.id)">删除</el-button>
 
 				  <el-button v-if="hasPermission('material:info:edit')&&(scope.row.status === '1'|| scope.row.status === '3') &&(scope.row.createById === $store.state.user.id ||haveProjectIds.includes(scope.row.projectId))" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
 				  <el-button text type="primary" size="small" v-if="hasPermission('material:info:del')&&(scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3')&&(scope.row.createById === $store.state.user.id ||haveProjectIds.includes(scope.row.projectId))" @click="del(scope.row.id)">删除</el-button>
@@ -204,6 +204,7 @@ export default {
 		  gridData:[],
 		  typeData:[],
 		  haveProjectIds:'',
+		  isJyAdmin:false
       }
     },
 	SignetService: null,
@@ -353,6 +354,7 @@ export default {
         //   this.loading = false
         // })
         this.checkIsAdmin()
+		  this.checkIsJyAdmin()
         processService.getByName('嘉溢-用印流程').then((data) => {
         	console.log('1',data)
           if (!this.commonJS.isEmpty(data.id)) {
@@ -361,6 +363,12 @@ export default {
           }
         })
       },
+		//判断当前登陆人是否是admin
+		checkIsJyAdmin(){
+			userService.checkIsJyAdmin().then((data)=>{
+				this.isJyAdmin = data
+			})
+		},
       // 当前页
       currentChangeHandle ({ currentPage, pageSize }) {
         this.tablePage.currentPage = currentPage