用车申请,付款管理

src/api/jy/DriveService.js

@@ -82,4 +82,19 @@ export default class DriveService{
 		});
 	}
 
+	getUserTime(){
+		return request({
+			url: prefix + "/drive/getUserTime",
+			method: "get"
+		})
+	}
+
+	checkTimeRange(useStartTime,useEndTime){
+		return request({
+			url: prefix + "/drive/checkTimeRange",
+			method: "get",
+			params: {useStartTime:useStartTime, useEndTime:useEndTime}
+		})
+	}
+
 }

src/views/jy/drive/DriveApplyForm.vue

@@ -12,7 +12,6 @@
 				<el-col :span="24">
 					<vxe-table
 						border
-						:footer-method="footerMethod2"
 						show-overflow
 						show-footer
 						ref="baseTable"
@@ -25,7 +24,6 @@
 						keep-source
 						:readonly="true"
 						highlight-current-row
-						:edit-rules="tableRules"
 						:edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true, icon: '-'}"
 					>
 						<vxe-table-column field="name" align="center" title="项目名称" :edit-render="{}" show-overflow="title">
@@ -73,8 +71,9 @@
 								  :rules="[
 								  {required: true, message:'用车起止时间不能为空', trigger:'blur'}]">
 						<el-date-picker
+							:disabled-date="getDisabledData"
 							v-model="inputForm.useDate"
-							type="datetimerange"
+							type="daterange"
 							start-placeholder="请选择开始时间"
 							end-placeholder="请选择结束时间"
 							value-format="YYYY-MM-DD HH:mm:ss"
@@ -113,6 +112,7 @@
 	import UserSelectSignatory from './clientUserSelect'
 	import UpLoadComponent from '@/views/common/UpLoadComponent'
 	import CommonApi from '@/api/cw/common/CommonApi'
+	import moment from "moment";
 	export default {
 		props: {
 			businessId: {
@@ -149,6 +149,7 @@
 				keyWatch: '',
 				dateList:[],
 				programRow:'',
+				disabledDates:[],
 
 			}
 		},
@@ -182,10 +183,8 @@
 		watch: {
 			'keyWatch': {
 				handler (newVal) {
-					if (this.bus) {
-						if (this.bus !== 'false') {
-							this.init('', this.bus)
-						}
+					if (this.commonJS.isNotEmpty(this.bus)) {
+						this.init('', this.bus)
 					} else {
 						this.$nextTick(() => {
 							this.$refs.inputForm.resetFields()
@@ -222,24 +221,23 @@
 					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.driveService.queryById(this.inputForm.id).then((data)=>{
-							this.inputForm = this.recover(this.inputForm, data)
-							this.inputForm.files=data.files
-							console.log('s',this.inputForm)
-							if (this.status === 'audit' || this.status === 'taskFormDetail') {
-								method = 'view'
-							}
-							if (this.commonJS.isEmpty(this.inputForm.projectList)) {
-								this.inputForm.projectList=[]
-							}
-							console.log('me',method)
-							this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'driveApply',null,null,null,null,null)
-							this.loading = false
-						})
-
-					}
+					this.driveService.queryById(this.inputForm.id).then((data)=>{
+						this.inputForm = this.recover(this.inputForm, data)
+						this.inputForm.files=data.files
+						console.log('s',this.inputForm)
+						if (this.status === 'audit' || this.status === 'taskFormDetail') {
+							method = 'view'
+						}
+						if (this.commonJS.isEmpty(this.inputForm.projectList)) {
+							this.inputForm.projectList=[]
+						}
+						console.log('me',method)
+						this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'driveApply',null,null,null,null,null)
+						this.loading = false
+					})
+					this.driveService.getUserTime().then((data)=>{
+						this.disabledDates = data
+					})
 				})
 			},
 			saveForm(callback) {
@@ -326,29 +324,7 @@
 					})
 					return
 				} else if (status === 'start') {
-					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('请选择用车时间')
-						this.loading = false
-					}
-					if (this.commonJS.isEmpty(this.inputForm.useMen)){
-						this.$message.error('请选择用车人员')
-						this.loading = false
-					}
-					if (this.commonJS.isEmpty(this.inputForm.useReason)){
-						this.$message.error('请选择用车原因')
-						this.loading = false
-					}
-					this.inputForm.useStartTime=this.inputForm.useDate[0]
-					this.inputForm.useEndTime=this.inputForm.useDate[1]
-					if (this.$refs.uploadComponent.checkProgress()) {
-						this.loading = false
-						return
-					}
+
 					this.inputForm.files = this.$refs.uploadComponent.getDataList()
 					// 送审  待审核
 					this.inputForm.status = '2'
@@ -360,22 +336,56 @@
 				this.$refs['inputForm'].validate((valid) => {
 					if (valid) {
 						this.loading = true
+						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('请选择用车时间')
+							this.loading = false
+						}
+						if (this.commonJS.isEmpty(this.inputForm.useMen)){
+							this.$message.error('请选择用车人员')
+							this.loading = false
+						}
+						if (this.commonJS.isEmpty(this.inputForm.useReason)){
+							this.$message.error('请选择用车原因')
+							this.loading = false
+						}
+
+						if (this.$refs.uploadComponent.checkProgress()) {
+							this.loading = false
+							return
+						}
+						this.inputForm.useStartTime=this.inputForm.useDate[0]
+						this.inputForm.useEndTime=this.inputForm.useDate[1]
 						console.log('form',this.inputForm)
-						if (this.commonJS.isNotEmpty(this.inputForm.useMen)) {
-							this.driveService.checkUseMen(this.inputForm.useMen).then((data)=>{
-								if (data === false){
-									this.$message.error('只能选择本部门员工')
+						if (this.commonJS.isNotEmpty(this.inputForm.useStartTime) && this.commonJS.isNotEmpty(this.inputForm.useEndTime)){
+							this.driveService.checkTimeRange(this.inputForm.useStartTime,this.inputForm.useEndTime).then((data)=>{
+								if (data){
 									this.loading = false
-									return
+									this.$message.error('用车时间存在重叠,请重新选择时间')
+									throw new Error()
+								}else {
+									if (this.commonJS.isNotEmpty(this.inputForm.useMen)) {
+										this.driveService.checkUseMen(this.inputForm.useMen).then((data) => {
+											if (data === false) {
+												this.$message.error('只能选择本部门员工')
+												this.loading = false
+												return
+											}
+											this.driveService.saveForm(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
+											})
+										})
+									}
 								}
-								this.driveService.saveForm(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 {
@@ -506,6 +516,40 @@
 				this.programRow = ''
 				// this.inputForm.reconciliationArea = this.inputForm.financeInvoiceBaseDTOList[0].location
 			},
+			//获取需要禁用时间
+			getDisabledData(time) {
+
+				// if (time.getTime() < Date.now() - 24 * 3600 * 1000){
+				// 	return true
+				// }
+				// 检查给定的时间是否在禁用时间范围内
+				for (let i = 0; i < this.disabledDates.length; i++) {
+					const startTime = moment(this.disabledDates[i].startTime).startOf('day');
+					const endTime = moment(this.disabledDates[i].endTime).endOf('day');
+					const timeMoment = moment(time);
+					console.log('startTime',startTime.valueOf())
+					console.log('endTime',endTime.valueOf())
+					console.log('time.getTime()',time.getTime())
+					if (timeMoment.isBetween(startTime, endTime, null, '[]') || time.getTime() < Date.now() - 24 * 3600 * 1000) {
+						return true; // 如果在给定的禁用时间范围内，返回 true
+					}
+				}
+
+				// 如果没有在禁用时间范围内，则检查是否在过去（不包括今天）
+				return false;
+			},
+
+			//校验时间
+			checkTimeRange(){
+				this.loading = true
+				this.inputForm.useStartTime=this.inputForm.useDate[0]
+				this.inputForm.useEndTime=this.inputForm.useDate[1]
+				this.driveService.checkTimeRange(this.inputForm.useStartTime,this.inputForm.useEndTime).then((data)=>{
+					this.loading = false
+					this.$message.error(data)
+					return
+				})
+			}
 
 
 

src/views/jy/payment/PaymentDia.vue

@@ -47,9 +47,9 @@
 								<el-input :disabled="true" :readonly="true" placeholder="请填写合同编号" v-model="scope.row.ncontractNo"/>
 							</template>
 						</vxe-table-column>
-						<vxe-table-column  field="contractAmount" align="center" title="合同金额" :edit-render="{}">
+						<vxe-table-column  field="contractName" align="center" title="合同名称" :edit-render="{}">
 							<template v-slot:edit="scope">
-								<el-input :disabled="true" placeholder="请填写合同金额" v-model="scope.row.contractAmount"/>
+								<el-input :disabled="true" placeholder="请填写合同名称" v-model="scope.row.contractName"/>
 							</template>
 						</vxe-table-column>
 						<vxe-table-column title="操作" align="center" width="100">
@@ -703,14 +703,14 @@
 						r.projectId=item.id
 						r.name = item.name
 						r.contractNo = item.contractNo
-						r.contractAmount = item.contractAmount
+						r.contractName = item.contractName
 						console.log('2',this.inputForm.projectDTOList[this.programRow])
 					} else {
 						let r = {
 							projectId: item.id,
 							name: item.name,
 							contractNo: item.contractNo,
-							contractAmount: item.contractAmount,
+							contractName: item.contractName,
 						}
 						this.$refs.baseTable.insertAt(r)
 						this.inputForm.projectDTOList.push(r)

src/views/jy/payment/PaymentForm.vue

@@ -28,26 +28,54 @@
 						:edit-rules="tableRules"
 						:edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true, icon: '-'}"
 					>
-						<vxe-table-column field="name" align="center" title="项目名称" :edit-render="{}" show-overflow="title">
-							<template v-slot:edit="scope">
-								<el-input  :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" @focus="openProgramPageForm(scope.$rowIndex)" placeholder="请填写项目名称" :readonly="true" v-model="scope.row.name"/>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column field="contractNo" align="center" title="合同编号" :edit-render="{}">
-							<template v-slot:edit="scope">
-								<el-input :disabled="true" :readonly="true" placeholder="请填写合同编号" v-model="scope.row.contractNo"/>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column  field="contractAmount" align="center" title="合同金额" :edit-render="{}">
-							<template v-slot:edit="scope">
-								<el-input :disabled="true" placeholder="请填写合同金额" v-model="scope.row.contractAmount"/>
-							</template>
-						</vxe-table-column>
-						<vxe-table-column title="操作" align="center" width="100">
-							<template v-slot="scope">
-								<el-button :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'base')">删除</el-button>
-							</template>
-						</vxe-table-column>
+						<div v-if="status !== 'audit'">
+							<vxe-table-column  field="name" align="center" title="项目名称" :edit-render="{}" show-overflow="title">
+								<template v-slot:edit="scope">
+									<el-input  :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" @focus="openProgramPageForm(scope.$rowIndex)" placeholder="请填写项目名称" :readonly="true" v-model="scope.row.name"/>
+								</template>
+							</vxe-table-column>
+							<vxe-table-column field="contractNo" align="center" title="合同编号" :edit-render="{}">
+								<template v-slot:edit="scope">
+									<el-input :disabled="true" :readonly="true" placeholder="请填写合同编号" v-model="scope.row.contractNo"/>
+								</template>
+							</vxe-table-column>
+							<vxe-table-column  field="contractName" align="center" title="合同名称" :edit-render="{}">
+								<template v-slot:edit="scope">
+									<el-input :disabled="true" placeholder="请填写合同名称" v-model="scope.row.contractName"/>
+								</template>
+							</vxe-table-column>
+							<vxe-table-column title="操作" align="center" width="100">
+								<template v-slot="scope">
+									<el-button :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'base')">删除</el-button>
+								</template>
+							</vxe-table-column>
+						</div>
+						<div v-else>
+							<vxe-table-column field="name" align="center" title="项目名称" :edit-render="{}" show-overflow="title">
+								<template v-slot:edit="scope">
+									<el-input v-if="commonJS.isEmpty(scope.row.projectId)" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" @focus="openProgramPageForm(scope.$rowIndex)" placeholder="请填写项目名称" :readonly="true" v-model="scope.row.name"/>
+									<el-link v-else  type="primary" :underline="false"  @click="viewProject(scope.row)">{{scope.row.name}}</el-link>
+								</template>
+							</vxe-table-column>
+							<vxe-table-column field="contractNo" align="center" title="合同编号" :edit-render="{}">
+								<template v-slot:edit="scope">
+									<el-input v-if="commonJS.isEmpty(scope.row.projectId)" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" @focus="openProgramPageForm(scope.$rowIndex)" placeholder="请填写项目名称" :readonly="true" v-model="scope.row.contractNo"/>
+									<el-link v-else  type="primary" :underline="false"  @click="viewContract(scope.row)">{{scope.row.contractNo}}</el-link>
+								</template>
+							</vxe-table-column>
+							<vxe-table-column  field="contractName" align="center" title="合同名称" :edit-render="{}">
+								<template v-slot:edit="scope">
+									<el-input :disabled="true" placeholder="请填写合同名称" v-model="scope.row.contractName"/>
+								</template>
+							</vxe-table-column>
+							<vxe-table-column title="操作" align="center" width="100">
+								<template v-slot="scope">
+									<el-button :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'base')">删除</el-button>
+								</template>
+							</vxe-table-column>
+						</div>
+
+
 					</vxe-table>
 				</el-col>
 			</el-row>
@@ -186,6 +214,8 @@
 		<WorkClientChooseRadio ref="workClientChooseRadio" @getWorkClientRadioChoose="getWorkClientRadioChoose"></WorkClientChooseRadio>
 		<!-- 附件 -->
 		<UpLoadComponent ref="uploadComponent"></UpLoadComponent>
+		<ProjectDia  ref="projectDia" @refreshDataList="refreshList"></ProjectDia>
+		<ContractAddForm ref="contractAddForm" @refreshDataList="refreshList"></ContractAddForm>
 	</div>
 </template>
 
@@ -200,6 +230,9 @@
 	import WorkClientService from '@/api/jy/WorkClientService'
 	import UserSelect from '@/components/userSelect'
 	import UpLoadComponent from '@/views/common/UpLoadComponent'
+	import ProjectDia from '@/views/jy/project/ProjectDia'
+	import ProjectInfoService from "@/api/jy/ProjectInfoService";
+	import ContractAddForm from '@/views/jy/workContractInfo/ContractAddForm'
 	export default {
 		props: {
 			businessId: {
@@ -252,11 +285,13 @@
 		PaymentService:null,
 		CommonApi:null,
 		workClientService: null,
+		ProjectInfoService: null,
 		created () {
 			console.log('jld ')
 			this.paymentService=new PaymentService()
 			this.commonApi = new CommonApi()
 			this.workClientService = new WorkClientService()
+			this.projectInfoService=new ProjectInfoService()
 		},
 		mounted () {
 		},
@@ -269,6 +304,8 @@
 			UserSelectSignatory,
 			UserSelect,
 			UpLoadComponent,
+			ProjectDia,
+			ContractAddForm
 		},
 		computed: {
 			bus: {
@@ -677,7 +714,7 @@
 				if (type === 'base') {
 					if (this.inputForm.projectDTOList.length>=1){
 						if (this.commonJS.isEmpty(this.inputForm.projectDTOList[0].projectId)){
-							this.$message.error('第一行不能为空')
+							this.$message.error('非项目,只能有一条非项目数据')
 							return
 						}
 					}
@@ -708,14 +745,14 @@
 						r.projectId=item.id
 						r.name = item.name
 						r.contractNo = item.contractNo
-						r.contractAmount = item.contractAmount
+						r.contractName = item.contractName
 						console.log('2',this.inputForm.projectDTOList[this.programRow])
 					} else {
 						let r = {
 							projectId: item.id,
 							name: item.name,
 							contractNo: item.contractNo,
-							contractAmount: item.contractAmount,
+							contractName: item.contractName,
 						}
 						this.$refs.baseTable.insertAt(r)
 						this.inputForm.projectDTOList.push(r)
@@ -749,8 +786,19 @@
 					}
 				})
 				console.log('this.inputForm.bankNumber',this.inputForm.bankNumber)
-			}
-
+			},
+			//查看项目
+			viewProject (row) {
+				this.projectInfoService.findById(row.projectId).then((data)=>{
+					this.$refs.projectDia.init('view', data.id,data.auditId1, data.auditId2, data.auditId3,data.sealId,data.outInstanceId,data.reportsSubmitId,data.archiveId,data.eiaId)
+				})
+			},
+			//查看合同
+			viewContract (row) {
+				this.projectInfoService.findById(row.projectId).then((data)=>{
+					this.$refs.contractAddForm.init('view', data.contractId)
+				})
+			},
 
 
 		}

src/views/jy/payment/ProjectForm.vue

@@ -10,9 +10,9 @@
       append-to-body
       v-model="visible">
       <div v-if="isShow">
-<!--        <el-radio v-model="checkType" label="1" style="margin-right: 20px">项目</el-radio>-->
+        <el-radio v-model="checkType" label="1" style="margin-right: 20px">项目</el-radio>
 <!--        <el-radio v-model="checkType" label="2" style="margin-right: 20px">报告</el-radio>-->
-<!--	    <el-radio v-model="checkType" label="3" style="margin-right: 20px">其他</el-radio>-->
+	    <el-radio v-model="checkType" label="3" style="margin-right: 20px">其他</el-radio>
       </div>
 		<!--报告        -->
 		<div v-if="checkType === '2'">
@@ -296,7 +296,7 @@
             this.$message.error('请填写开票详情')
             return
           }
-          rows = [{projectName: this.detail}]
+          rows = [{name: this.detail}]
 		  rows.bj1 = 'bj1'
         }
 

src/views/jy/reimbursement/InfoForm.vue

@@ -112,6 +112,11 @@
 									<el-input v-model="scope.row.projectName" @focus="openBorrowForm(scope.$rowIndex, scope.row)"></el-input>
 								</template>
 							</vxe-table-column>
+							<vxe-table-column field="reportNumber" title="借款编号" :edit-render="{}" :rules="[]">
+								<template v-slot:edit="scope">
+									<el-input :disabled='true' v-model="scope.row.reportNumber"></el-input>
+								</template>
+							</vxe-table-column>
 							<vxe-table-column field="moneyLower" title="借款金额(元)" :edit-render="{}" :rules="[]">
 								<template v-slot:edit="scope">
 									<el-input :disabled='true' v-model="scope.row.moneyLower"></el-input>
@@ -178,6 +183,11 @@
 									<el-input v-model="scope.row.projectName" @focus="openPayment(scope.$rowIndex, scope.row)"></el-input>
 								</template>
 							</vxe-table-column>
+							<vxe-table-column field="reportNumber" title="付款编号" :edit-render="{}" :rules="[]">
+								<template v-slot:edit="scope">
+									<el-input :disabled='true' v-model="scope.row.reportNumber"></el-input>
+								</template>
+							</vxe-table-column>
 							<vxe-table-column field="paymentLower" title="付款金额(元)" :edit-render="{}" :rules="[]">
 								<template v-slot:edit="scope">
 									<el-input :disabled='true' v-model="scope.row.paymentLower"></el-input>
@@ -1015,6 +1025,7 @@
 					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].reportNumber = rows.no
 				}
 				this.indexRow = ''
 				this.$forceUpdate()
@@ -1023,6 +1034,7 @@
 				this.inputForm.infoPayments[this.indexRow].projectId = rows.id
 				this.inputForm.infoPayments[this.indexRow].projectName = rows.reason
 				this.inputForm.infoPayments[this.indexRow].paymentLower = rows.paymentLower
+				this.inputForm.infoPayments[this.indexRow].reportNumber = rows.no
 				this.indexRow = ''
 				this.$forceUpdate()
 			},

src/views/jy/reimbursement/ReimbursementForm.vue

@@ -103,6 +103,11 @@
 									<el-input v-model="scope.row.projectName" @focus="openBorrowForm(scope.$rowIndex, scope.row)"></el-input>
 								</template>
 							</vxe-table-column>
+							<vxe-table-column field="reportNumber" title="借款编号" :edit-render="{}" :rules="[]">
+								<template v-slot:edit="scope">
+									<el-input :disabled='true' v-model="scope.row.reportNumber"></el-input>
+								</template>
+							</vxe-table-column>
 							<vxe-table-column field="moneyLower" title="借款金额(元)" :edit-render="{}" :rules="[]">
 								<template v-slot:edit="scope">
 									<el-input :disabled='true' v-model="scope.row.moneyLower"></el-input>
@@ -169,6 +174,11 @@
 									<el-input v-model="scope.row.projectName" @focus="openPayment(scope.$rowIndex, scope.row)"></el-input>
 								</template>
 							</vxe-table-column>
+							<vxe-table-column field="reportNumber" title="付款编号" :edit-render="{}" :rules="[]">
+								<template v-slot:edit="scope">
+									<el-input :disabled='true' v-model="scope.row.reportNumber"></el-input>
+								</template>
+							</vxe-table-column>
 							<vxe-table-column field="paymentLower" title="付款金额(元)" :edit-render="{}" :rules="[]">
 								<template v-slot:edit="scope">
 									<el-input :disabled='true' v-model="scope.row.paymentLower"></el-input>
@@ -1015,6 +1025,7 @@
 					this.inputForm.infoborrows[this.indexRow].projectId = rows.id
 					this.inputForm.infoborrows[this.indexRow].projectName = rows.reason
 					this.inputForm.infoborrows[this.indexRow].moneyLower = rows.finalMoney
+					this.inputForm.infoborrows[this.indexRow].reportNumber = rows.no
 				}
 				this.indexRow = ''
 				this.$forceUpdate()
@@ -1023,6 +1034,7 @@
 				this.inputForm.infoPayments[this.indexRow].projectId = rows.id
 				this.inputForm.infoPayments[this.indexRow].projectName = rows.reason
 				this.inputForm.infoPayments[this.indexRow].paymentLower = rows.paymentLower
+				this.inputForm.infoPayments[this.indexRow].reportNumber = rows.no
 				this.indexRow = ''
 				this.$forceUpdate()
 			},