嘉溢bug调整

src/api/jy/MonthlyService.js

@@ -18,11 +18,11 @@ export default class MonthlyList{
 		})
 	}
 
-	queryById (id) {
+	queryById (id,method) {
 		return request({
 			url: prefix +'/monthly/findById',
 			method: 'get',
-			params: {id: id}
+			params: {id: id, method: method}
 		})
 	}
 

src/views/jy/evection/EvectionForm.vue

@@ -491,29 +491,33 @@
 			getProgram(rows) {
 				console.log('1',rows)
 				rows.forEach((item, index) => {
-					this.inputForm.programId = item.id
-					if (index === 0) {
-						let r = this.inputForm.projectList[this.programRow]
-						r.projectId=item.id
-						r.name = item.name
-						r.no = item.no
-						r.leader = item.projectLeader
-						r.createTime = item.createTime
-						console.log('2',this.inputForm.projectList[this.programRow])
-					} else {
-						let r = {
-							projectId: item.id,
-							name: item.name,
-							no: item.no,
-							leader: item.projectLeader,
-							createTime: item.createTime,
+					let exists = this.inputForm.projectList.some(project => project.projectId === item.id);
+					if (!exists){
+						this.inputForm.programId = item.id
+						if (index === 0) {
+							let r = this.inputForm.projectList[this.programRow]
+							r.projectId=item.id
+							r.name = item.name
+							r.no = item.no
+							r.leader = item.projectLeader
+							r.createTime = item.createTime
+							console.log('2',this.inputForm.projectList[this.programRow])
+						} else {
+							let r = {
+								projectId: item.id,
+								name: item.name,
+								no: item.no,
+								leader: item.projectLeader,
+								createTime: item.createTime,
+							}
+							this.$refs.baseTable.insertAt(r)
+							this.inputForm.projectList.push(r)
+							this.baseKey = Math.random()
 						}
-						this.$refs.baseTable.insertAt(r)
-						this.inputForm.projectList.push(r)
-						this.baseKey = Math.random()
 					}
 
 				})
+
 				this.$forceUpdate()
 				this.programRow = ''
 				// this.inputForm.reconciliationArea = this.inputForm.financeInvoiceBaseDTOList[0].location

src/views/jy/monthly/MonthlyForm.vue

@@ -239,7 +239,7 @@
 					this.$refs.inputForm.resetFields()
 					this.loading = true
 					this.$refs.uploadComponent.clearUpload()
-						this.monthlyService.queryById(this.inputForm.id).then((data)=>{
+						this.monthlyService.queryById(this.inputForm.id,method).then((data)=>{
 							this.inputForm = this.recover(this.inputForm, data)
 							if (this.commonJS.isEmpty(this.inputForm.createName)){
 								this.inputForm.createName=this.$store.state.user.name

src/views/jy/reimbursement/BorrowByUserIdForm.vue

@@ -35,6 +35,7 @@
 					</vxe-column>
 					<vxe-column min-width="160" align="center" title="借款用途" field="reason"></vxe-column>
 					<vxe-column min-width="160" align="center" title="借款金额" field="moneyLower"></vxe-column>
+					<vxe-column min-width="160" align="center" title="剩余借款金额" field="finalMoney"></vxe-column>
 				</vxe-table>
 				<vxe-pager
 					background

src/views/jy/reimbursement/PaymentByUserIdForm.vue

@@ -38,6 +38,7 @@
 					<vxe-column min-width="160" align="center" title="付款人部门" field="officeName"></vxe-column>
 					<vxe-column min-width="160" align="center" title="付款时间" field="paymentTime"></vxe-column>
 					<vxe-column min-width="160" align="center" title="付款金额" field="paymentLower"></vxe-column>
+					<vxe-column min-width="160" align="center" title="剩余付款金额" field="finalMoney"></vxe-column>
 				</vxe-table>
 				<vxe-pager
 					background

src/views/jy/reimbursement/ReimbursementForm.vue

@@ -833,6 +833,8 @@
 						this.inputForm.status = '2'
 						this.reimbursementService.saveForm(this.inputForm).then((data) => {
 							this.inputForm.id = data.businessId
+							let processTitle = `${this.$store.state.user.name} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了编号-${data.no} 的 [嘉溢-报销申请] `
+							this.inputForm.title = processTitle
 							callback(data.businessTable, data.businessId, this.inputForm)
 							this.$refs.inputForm.resetFields()
 							this.loading = false

src/views/jy/tender/BidForm.vue

@@ -202,27 +202,27 @@
 							</vxe-table-column>
 							<vxe-table-column align="center" field="purchaseNumber" title="采购申请号" :edit-render="{}" :rules="[{required: true, message:'请输入采购申请号', trigger:'blur'}]">
 								<template v-slot:edit="scope">
-									<el-input v-model="scope.row.purchaseNumber"></el-input>
+									<el-input maxlength="64" v-model="scope.row.purchaseNumber"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column align="center" field="subscaleNumber" title="分标编号" :edit-render="{}" :rules="[{required: true, message:'请输入分标编号', trigger:'blur'}]">
 								<template v-slot:edit="scope">
-									<el-input v-model="scope.row.subscaleNumber"></el-input>
+									<el-input maxlength="64" v-model="scope.row.subscaleNumber"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column align="center" field="subscaleName" title="分标名称" :edit-render="{}" :rules="[{required: true, message:'请输入分标名称', trigger:'blur'}]">
 								<template v-slot:edit="scope">
-									<el-input v-model="scope.row.subscaleName"></el-input>
+									<el-input maxlength="64" v-model="scope.row.subscaleName"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column align="center" field="packageNumber" title="包号" :edit-render="{}" :rules="[{required: true, message:'请输入包号', trigger:'blur'}]">
 								<template v-slot:edit="scope">
-									<el-input v-model="scope.row.packageNumber"></el-input>
+									<el-input maxlength="64" v-model="scope.row.packageNumber"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column align="center" field="sectionName" title="招标项目标段名称" :edit-render="{}" :rules="[{required: true, message:'请输入招标项目标段名称', trigger:'blur'}]">
 								<template v-slot:edit="scope">
-									<el-input v-model="scope.row.sectionName"></el-input>
+									<el-input maxlength="64" v-model="scope.row.sectionName"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column align="center" field="money" title="采购金额(元)" :edit-render="{}" :rules="[{required: true, message:'请输入采购金额', trigger:'blur'}]">
@@ -232,7 +232,7 @@
 							</vxe-table-column>
 							<vxe-table-column align="center" field="remarks" title="备注" :edit-render="{}">
 								<template v-slot:edit="scope">
-									<el-input v-model="scope.row.remarks" ></el-input>
+									<el-input maxlength="64" v-model="scope.row.remarks" ></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column title="操作" width="180">

src/views/jy/tender/BidList.vue

@@ -81,12 +81,9 @@
 							<el-link  type="primary" :underline="false" @click="view(scope.row.basicId)">{{scope.row.batch}}</el-link>
 						</template>
 					</vxe-column>
-					<vxe-column min-width="160" align="center" title="采购申请号" field="purchaseNumber"></vxe-column>
-					<vxe-column min-width="160" align="center" title="分标编号" field="subscaleNumber"></vxe-column>
-					<vxe-column min-width="160" align="center" title="分标名称" field="subscaleName"></vxe-column>
-					<vxe-column min-width="160" align="center" title="包号" field="packageNumber"></vxe-column>
-					<vxe-column min-width="160" align="center" title="招标项目标段名称" field="sectionName"></vxe-column>
-					<vxe-column min-width="160" align="center" title="采购金额(元)" field="money"></vxe-column>
+					<vxe-column min-width="160" align="center" title="采购金额（元）" field="totalMoney"></vxe-column>
+					<vxe-column min-width="160" align="center" title="报名截止时间" field="applicationDeadline"></vxe-column>
+					<vxe-column min-width="160" align="center" title="截标时间" field="bidClosingTime"></vxe-column>
 					<vxe-column min-width="160" align="center" title="创建人" field="createName"></vxe-column>
 					<vxe-column min-width="160" align="center" title="创建人部门" field="officeName"></vxe-column>
 					<vxe-column min-width="160" align="center" title="创建时间" field="createTime"></vxe-column>

src/views/jy/tender/TenderForm.vue

@@ -121,27 +121,27 @@
 							</vxe-table-column>
 							<vxe-table-column align="center" field="purchaseNumber" title="采购申请号" :edit-render="{}" :rules="[{required: true, message:'请输入采购申请号', trigger:'blur'}]">
 								<template v-slot:edit="scope">
-									<el-input v-model="scope.row.purchaseNumber"></el-input>
+									<el-input maxlength="64" v-model="scope.row.purchaseNumber"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column align="center" field="subscaleNumber" title="分标编号" :edit-render="{}" :rules="[{required: true, message:'请输入分标编号', trigger:'blur'}]">
 								<template v-slot:edit="scope">
-									<el-input v-model="scope.row.subscaleNumber"></el-input>
+									<el-input maxlength="64" v-model="scope.row.subscaleNumber"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column align="center" field="subscaleName" title="分标名称" :edit-render="{}" :rules="[{required: true, message:'请输入分标名称', trigger:'blur'}]">
 								<template v-slot:edit="scope">
-									<el-input v-model="scope.row.subscaleName"></el-input>
+									<el-input maxlength="64" v-model="scope.row.subscaleName"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column align="center" field="packageNumber" title="包号" :edit-render="{}" :rules="[{required: true, message:'请输入包号', trigger:'blur'}]">
 								<template v-slot:edit="scope">
-									<el-input v-model="scope.row.packageNumber"></el-input>
+									<el-input maxlength="64" v-model="scope.row.packageNumber"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column align="center" field="sectionName" title="招标项目标段名称" :edit-render="{}" :rules="[{required: true, message:'请输入招标项目标段名称', trigger:'blur'}]">
 								<template v-slot:edit="scope">
-									<el-input v-model="scope.row.sectionName"></el-input>
+									<el-input maxlength="64" v-model="scope.row.sectionName"></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column align="center" field="money" title="采购金额(元)" :edit-render="{}" :rules="[{required: true, message:'请输入采购金额', trigger:'blur'}]">
@@ -151,7 +151,7 @@
 							</vxe-table-column>
 							<vxe-table-column align="center" field="remarks" title="备注" :edit-render="{}">
 								<template v-slot:edit="scope">
-									<el-input v-model="scope.row.remarks" ></el-input>
+									<el-input maxlength="500" v-model="scope.row.remarks" ></el-input>
 								</template>
 							</vxe-table-column>
 							<vxe-table-column title="操作" width="180">