2023/03/04

src/components/subject/projectplan/CollectiveLandAcquisition/CollectiveBasic.vue

@@ -93,7 +93,7 @@
 			<div class="form">
 				<el-form :disabled='authority==1||parameter.wfAnzhiState=="已开启"'>
 					<el-form-item :label="item.street" class="msg" label-width="160px" prop="projectCode" style="width: 33%;"
-					 v-for="(item,index) in householdprefix">
+					 v-for="(item,index) in householdprefix" :key="index">
 						<el-input autocomplete="off" :disabled="item.limit" v-model='householdprefix[index].numberPrefix' @blur="revisePrefix(item,index)"></el-input>
 					</el-form-item>
 				</el-form>

src/components/subject/projectplan/CollectiveLandAcquisition/SignAcontract.vue

@@ -1,15 +1,15 @@
 <template>
 	<div class="SignAcontract">
 		
-		<div class="indexbutton" v-if="waycontrol">
+		<!-- <div class="indexbutton" v-if="waycontrol">
 			<ul>
 				<li @click="VacateExamine('货币')">货币</li>
 				<li @click="VacateExamine('迁建')">迁建</li>
 				<li @click="VacateExamine('混合')">混合</li>
 			</ul>
-		</div>
+		</div> -->
 		
-		<div class="SignAcontract-content" v-if="!waycontrol">
+		<div class="SignAcontract-content">
 			<div class="SignAcontract-content-right">
 				<div class="button-background" @click="control(0)"><el-button :disabled='PlacementMode==1'>上一步</el-button></div>
 				<el-steps :active="index" align-center style="width: calc(100% - 212px);">
@@ -23,6 +23,13 @@
 			</div>
 			<div class="SignAcontract-content-lent">
 				<div class="SignAcontract-content-lent-data" v-if="index!=4">
+					<div class="indexbutton" v-if="index==1">
+						<ul>
+							<li @click="VacateExamine('货币')">货币</li>
+							<li @click="VacateExamine('迁建')">迁建</li>
+							<li @click="VacateExamine('混合')">混合</li>
+						</ul>
+					</div>
 					<!-- 调产安置(房票)-->
 					<collectiveCompensateRoomTicket ref='agreement' v-if="datahousehold.placementWay=='调产'||datahousehold.placementWay=='混合'" :strpdetails='strpdetails' :jurisdiction='index-1' :datahousehold='datahousehold'></collectiveCompensateRoomTicket>
 					<!-- 货币安置 -->
@@ -166,7 +173,7 @@
 	
 	export default {
 		name: "survey",
-		props: ['strpdetails','datahousehold'],
+		props: ['strpdetails','datahouseholdmax'],
 		components:{
 			collectiveCompensateRoomTicket,
 			CurrencyDetails,
@@ -270,7 +277,9 @@
 					nonResidentialRenovationCompensate:'装修、附属物补偿费金额'
 				},
 				reportErrors:[],
-				errorControl:false
+				errorControl:false,
+				
+				datahousehold:{}
 			}
 		},
 		computed: {
@@ -293,6 +302,7 @@
 			},
 		},
 		mounted() {
+			this.datahousehold=this.datahouseholdmax
 			if(!this.datahousehold.placementWay||this.datahousehold.signingProgress==null||this.datahousehold.signingProgress==''){
 				this.index=1
 				this.waycontrol=true
@@ -315,6 +325,7 @@
 				this.datahousehold.placementWay=row
 				this.$http.post('api/auth/householdcx/update',this.datahousehold).then((res) => {
 					if (res.status == 200 && res.data.code == 0) {
+						this.datahousehold=res.data.data
 						this.waycontrol=false
 						this.index=2
 						this.GetreportErrors()
@@ -366,21 +377,20 @@
 				if(this.index<=1){
 					this.waycontrol=true
 					this.index=1
+					this.NotStarted(0,Positive)
 				}else if(this.index==2){
 					if(this.datahousehold.levyHouseNature=='非住宅'){
 						this.PlacementMode=1
 					}
-					this.NotStarted(0,Positive)
+					this.NotStarted(1,Positive)
 				}else if(this.index==3){
 					if(this.datahousehold.levyHouseNature=='非住宅'){
 						this.PlacementMode=0
 					}
-					// this.$refs.agreement.addcontrol();
-					this.NotStarted(1,Positive)
+					this.NotStarted(2,Positive)
 				}else if(this.index==4){
 					this.index=4
-					this.Statistics()
-					this.NotStarted(2,Positive)
+					this.NotStarted(3,Positive)
 					this.getgetexaminefile()
 				}else if(this.index>=5){
 					var apcs=0
@@ -403,18 +413,27 @@
 				  this.$http.get('api/auth/file/fileList?type=' + 2 + '&id=' + this.datahousehold.id, null).then((res) => {
 				    if (res.status == 200 && res.data.code == 0) {
 						this.fileListindex = res.data.list
+						// if(item=='补偿明细单'){
+						// 	this.selectFileName ='3、审批后资料/1、征收补偿明细单'
+						// }else if(item=='补偿协议'){
+						// 	this.selectFileName ='3、审批后资料/2、征收补偿协议'
+						// }
 						var data=[
-							{name:'补偿明细单',empty:false,type: "folder",url:'补偿明细单',tree:[]},
-							{name:'补偿协议',empty:false,type: "folder",url:'补偿协议',tree:[]},
+							{name:'补偿明细单',empty:false,type: "folder",url:'3、审批后资料\\1、征收补偿明细单',tree:[]},
+							{name:'补偿协议',empty:false,type: "folder",url:'3、审批后资料\\2、征收补偿协议',tree:[]},
 						]
 						if(this.fileListindex){
 							this.fileListindex.forEach((item,index)=>{
 								if(item.empty==false){
-									data.forEach((nale,ixde)=>{
-										if(item.name==nale.name){
-											data[ixde]=item
-										}
-									})
+									if(item.name=='3、审批后资料'){
+										item.tree.forEach((nale,ixde)=>{
+											data.forEach((dana,ixd)=>{
+												if(dana.url==nale.url){
+													data[ixd].tree=nale.tree
+												}
+											})
+										})
+									}
 								}
 							})
 						}
@@ -485,22 +504,29 @@
 			  });
 			},
 			NotStarted(row,tow){
-				var data=['结算单','征迁协议','上传资料']
+				var data=['','结算单','征迁协议','上传资料']
 				var Tips=''
 				if (tow) {
 					Tips=data[row+1]+'退回成功'
 				} else{
 					Tips=data[row-1]+'签订成功'
-				}
-				if(data[row]=='征迁协议'){
-					this.datahousehold.accountsPayable=this.$refs.agreement.total
+					if(data[row]=='征迁协议'){
+						this.datahousehold.accountsPayable=this.$refs.agreement.total
+						this.datahousehold.contractedResettlementArea=this.contractedResettlementArea
+					}
 				}
 				this.datahousehold.projectId = this.strpdetails.bussiness.id,
 				this.datahousehold.signingProgress=data[row]
 				this.$http.post('api/auth/householdcx/update', this.datahousehold).then((res) => {
 					if (res.status == 200 && res.data.code == 0) {
+						this.datahousehold=res.data.data
 						this.$message.success(Tips);
 					} else {
+						if(tow){
+							this.index=row+2
+						}else{
+							this.index=row
+						}
 						this.$message.error(Tips);
 					}
 				})
@@ -509,13 +535,12 @@
 				this.contractedResettlementArea=res
 			},
 			// 签约可安置面积-征迁协议确定的安置面积，用做统计使用
-			Statistics(){
-				this.datahousehold.projectId = this.strpdetails.bussiness.id,
-				this.datahousehold.contractedResettlementArea=this.contractedResettlementArea
-				this.$http.post('api/auth/householdcx/update', this.datahousehold).then((res) => {
-					if (res.status == 200 && res.data.code == 0) {}
-				})
-			},
+			// Statistics(){
+			// 	this.datahousehold.projectId = this.strpdetails.bussiness.id,
+			// 	this.$http.post('api/auth/householdcx/update', this.datahousehold).then((res) => {
+			// 		if (res.status == 200 && res.data.code == 0) {}
+			// 	})
+			// },
 			SignAcontract(){
 				this.datahousehold.projectId = this.strpdetails.bussiness.id,
 				this.datahousehold.agreementSigningStatus='已签约'
@@ -523,6 +548,7 @@
 				this.datahousehold.signingDateOfCompensationAgreement=this.signingDateOfCompensationAgreement
 				this.$http.post('api/auth/householdcx/update', this.datahousehold).then((res) => {
 					if (res.status == 200 && res.data.code == 0) {
+						this.datahousehold=res.data.data
 						this.$emit('getlist',1)
 						this.$message.success('签约成功!');
 					} else {
@@ -537,6 +563,7 @@
 				this.datahousehold.farmerPreferenceRemarks=this.farmerPreferenceRemarks
 				this.$http.post('api/auth/householdcx/update', this.datahousehold).then((res) => {
 					if (res.status == 200 && res.data.code == 0) {
+						this.datahousehold=res.data.data
 						this.FarmerPreference = false
 						this.SignAcontract(),
 						this.index=5
@@ -564,7 +591,13 @@
 			},
 			// 上传文件按钮
 			selectFile(item) {
-			  this.selectFileName = item;
+				console.log(item)
+				if(item=='补偿明细单'){
+					this.selectFileName ='3、审批后资料/1、征收补偿明细单'
+				}else if(item=='补偿协议'){
+					this.selectFileName ='3、审批后资料/2、征收补偿协议'
+				}
+			  // this.selectFileName = item;
 			},
 			//删除文件
 			deleteFile(item) {
@@ -606,27 +639,27 @@
 		width: 100%;
 		height: 100%;
 		.indexbutton{
-			position: absolute;
-			top: 0;
-			right: 0;
-			width: 100%;
-			height: 100%;
-			background-color: #00000050;
+			// position: absolute;
+			// top: 0;
+			// right: 0;
+			// width: 100%;
+			// height: 100%;
+			// background-color: #00000050;
 			ul{
 				position: fixed;
 				z-index: 11;
-				top: 40%;
+				top: 45%;
 				left: 25%;
 				width: 50%;
 				display: flex;
 				justify-content: space-evenly;
 				li{
-					width: 100px;
-					height: 150px;
+					width: 150px;
+					height: 100px;
 					// background-image: linear-gradient(-225deg, #7DE2FC 0%, #B9B6E5 100%);
 					background-image: linear-gradient(15deg, #13547a 0%, #80d0c7 100%);
 					border-radius: 20px;
-					line-height: 150px;
+					line-height: 100px;
 					color: #fff;
 					font-size: 18px;
 					text-align: center;

src/components/subject/projectplan/CollectiveLandAcquisition/relocatehousehold.vue

@@ -160,7 +160,7 @@
 							</el-table-column>
 							<el-table-column v-if="switchi==2" prop="amountPaid" label="已付款">
 								<template slot-scope="scope">
-									<span style="color: #439dc1;" @click="getPayrecord(scope.row)">{{scope.row.amountPaid}}</span>
+									<span style="color: #439dc1;cursor: pointer;" @click="getPayrecord(scope.row.id)">{{scope.row.amountPaid}}</span>
 								</template>
 							</el-table-column>
 							<el-table-column v-if="switchi!=0" prop="signingDateOfCompensationAgreement"
@@ -266,7 +266,7 @@
 						<el-form-item label="镇（街道）" prop="street" label-width="120px">
 							<el-select placeholder="请选择征收房屋性质" v-model="addlist.street" clearable :disabled='namestreet.length==1'
 							 style="width: 100%;">
-								<el-option :label="item" :value="item" v-for="item in namestreet"></el-option>
+								<el-option :label="item" :value="item" v-for="(item,index) in namestreet" :key="index"></el-option>
 							</el-select>
 							<!-- <el-input v-model="addlist.street" placeholder="请输入内容"></el-input> -->
 						</el-form-item>
@@ -278,7 +278,7 @@
 						</el-form-item>
 						<el-form-item label="地段等级" prop="oldHouseAddress" label-width="120px">
 							<el-select v-model="addlist.locationClassification" placeholder="请选择地段等级" clearable style="width: 100%;">
-								<el-option v-for="i in earth" :label="i" :value="i"></el-option>
+								<el-option v-for="(i,index) in earth" :key="index" :label="i" :value="i"></el-option>
 							</el-select>
 						</el-form-item>
 					</el-form>
@@ -345,17 +345,16 @@
 												<el-option label="非住宅" value="非住宅"></el-option>
 											</el-select>
 										</el-form-item>
-										<el-form-item label="安置方式" label-width="130px" prop="projectName">
+										<!-- <el-form-item label="安置方式" label-width="130px" prop="projectName">
 											<el-select placeholder="请选择安置方式" :disabled='datahousehold.levyHouseNature=="非住宅"' v-model="datahousehold.placementWay" clearable style="width: 100%;">
-												<!-- <el-option label="调产" value="调产"></el-option> -->
 												<el-option label="货币" value="货币"></el-option>
 												<el-option label="混合" value="混合"></el-option>
 												<el-option label="迁建" value="迁建"></el-option>
 											</el-select>
-										</el-form-item>
+										</el-form-item> -->
 										<el-form-item label="地段等级" label-width="130px" prop="projectName">
 											<el-select placeholder="请选择地段等级"  v-model="datahousehold.locationClassification" clearable  style="width: 100%;">
-												<el-option v-for="i in earth" :label="i" :value="i"></el-option>
+												<el-option v-for="(i,index) in earth" :key="index" :label="i" :value="i"></el-option>
 											</el-select>
 										</el-form-item>
 										
@@ -1024,7 +1023,7 @@
 			<el-dialog title="错误" :visible.sync="errorControl" width="35%" max-width='350px'>
 				<div style="max-height: 250px;overflow: auto;">
 					<span style="color: red;margin-bottom: 5px;display: block;"
-						v-for="(item,index) in errorData">{{item}}<br></span>
+						v-for="(item,index) in errorData" :key="index">{{item}}<br></span>
 				</div>
 			</el-dialog>
 		</div>
@@ -1062,7 +1061,7 @@
 					<div class="indexControl-ont">
 						<div class="indexControl-ont-title">文件列表</div>
 						<ul>
-							<li v-for="i in fileList" @click="getfileList(i)">
+							<li v-for="(i,index) in fileList" :key="index" @click="getfileList(i)">
 								<div>
 									<div v-if="i.tree.length!=0"><img src="../../../../assets/file-full.png" alt="">
 									</div>
@@ -1152,7 +1151,7 @@
 							</div>
 							<div class="tc-middle-name">
 								<ul>
-									<li v-for="itemid in filelist.tree" @click="nodeClic(itemid),Exconrtl=true">
+									<li v-for="itemid in filelist.tree" :key="itemid.name" @click="nodeClic(itemid),Exconrtl=true">
 										<i class="el-icon-error" @click.stop="deleteFile(itemid)"></i>
 										<img v-if="itemid.name.split('.').pop().toLowerCase()=='pdf'"
 											src="../../../../assets/file-pdf.png" alt="">
@@ -1247,15 +1246,40 @@
 				</div>
 			</el-dialog>
 		</div>
+		<!-- 付款记录 -->
+		<div class="tk">
+			<el-dialog title="付款记录" :visible.sync="payreControl" :modal-append-to-body='false' top="10%" width="50%">
+				<div class="WithoutInterval">
+					<el-table :data="payrecord" height="500px" :header-cell-style="{background:'#e2e2e2'}" style="width: 100%">
+						<el-table-column prop="payAmount" label="付款金额">
+						</el-table-column>
+						<el-table-column prop="payDate" label="付款时间">
+						</el-table-column>
+						<el-table-column prop="remarks" label="备注">
+						</el-table-column>
+						<el-table-column fixed="right" label="操作" width="150">
+							<template slot-scope="scope">
+								<el-button @click="getdocument(scope.row)" type="text" size="small"
+									:disabled='authority==1'>
+									查看文件</el-button>
+								<el-button @click="deletepayrecord(scope.row)" type="text" size="small"
+									:disabled='authority==1' style="color: #FF4500 ;">
+									撤销付款</el-button>
+							</template>
+						</el-table-column>
+					</el-table>
+				</div>
+			</el-dialog>
+		</div>
 		<!-- 签订协议 -->
 		<div v-if="coverControl">
-			<SignAcontract @getlist='getList' :strpdetails='strpdetails' :datahousehold='datahousehold'></SignAcontract>
-			<div class="cover" @click="coverControl=false"></div>
+			<SignAcontract @getlist='getList' :strpdetails='strpdetails' :datahouseholdmax='datahousehold'></SignAcontract>
+			<div class="cover" @click="coverControl=false,getList()"></div>
 		</div>
 		<!-- 签订协议 -->
 		<div v-if="covercommit">
-			<Scommit @getlist='getList' :strpdetails='strpdetails' :datahousehold='datahousehold'></Scommit>
-			<div class="cover" @click="covercommit=false"></div>
+			<Scommit @getlist='getList' :strpdetails='strpdetails' :datahouseholdmax='datahousehold'></Scommit>
+			<div class="cover" @click="covercommit=false,getList()"></div>
 		</div>
 	</div>
 </template>
@@ -1282,6 +1306,9 @@
 		},
 		data() {
 			return {
+				payreControl:false,
+				payrecord:[],
+				
 				currentContro:'1',
 				//签协议控制
 				coverControl: false,
@@ -1470,6 +1497,7 @@
 				filelist: [],
 				Exconrtl: false,
 				selectFileName: '',
+				selectFileNameUrl:'',
 				Reremar: '',
 				
 				namestreet:[],
@@ -1503,11 +1531,54 @@
 				}
 		},
 		methods: {
+			//获取签订记录
+			getdocument(row){
+					  this.$http.get('api/auth/file/fileList?type=' + 2 + '&id=' + row.householdId, null).then((res) => {
+					    if (res.status == 200 && res.data.code == 0) {
+							this.fileListindex = res.data.list
+							var data=[]
+							if(this.fileListindex){
+								this.fileListindex.forEach((item,index)=>{
+									if(item.empty==false){
+										if(item.name=='3、审批后资料'){
+											item.tree.forEach((nale,ixde)=>{
+												if(nale.name=='3、打款凭证'){
+													nale.tree.forEach((nana,ixde)=>{
+														if(nana.name==row.id){
+															data[0]=nana
+														}
+													})
+												}
+											})
+										}
+									}
+								})
+							}
+							this.fileListindex=data
+							this.Examine=true
+						} else {
+					      this.$message.error("查找文件列表失败!");
+					    }
+					});
+			},
+			//撤销付款记录
+			deletepayrecord(row){
+				this.$http.get('api/auth/payrecord/cancelPay?id='+row.id,null).then((res) => {
+					if (res.status == 200 && res.data.code == 0) {
+						this.getPayrecord(row.householdId)
+						this.getList()
+						this.$message.success('撤销付款成功!');
+					} else {
+						this.$message.error("撤销付款失败!");
+					}
+				})
+			},
 			//获取付款记录
 			getPayrecord(row){
-					this.$http.get('api/auth/payrecord/list?householdId='+row.id,null).then((res) => {
+					this.$http.get('api/auth/payrecord/list?householdId='+row,null).then((res) => {
 						if (res.status == 200 && res.data.code == 0) {
-							console.log(res)
+							this.payreControl=true
+							this.payrecord=res.data.list
 						} else {
 							this.$message.error("获取失败!");
 						}
@@ -1956,6 +2027,7 @@
 							this.$message.success('修改成功!');
 						} else {
 							this.$message.error("修改失败!");
+							this.getList()
 						}
 					})
 			},
@@ -2019,6 +2091,11 @@
 				this.Reremar=''
 				this.getexaminefileid = res
 				this.selectFileName = red
+				if(red=='腾房'){
+					this.selectFileNameUrl='3、审批后资料\\3、腾房凭证'
+				}else if(red=='注销'){
+					this.selectFileNameUrl='3、审批后资料\\4、注销凭证'
+				}
 				this.getfilelist()
 				this.control = true
 			},
@@ -2031,17 +2108,19 @@
 							name: this.selectFileName + '资料',
 							empty: false,
 							type: "folder",
-							url: this.selectFileName + '资料',
+							url: this.selectFileNameUrl,
 							tree: []
 						}, ]
 						if (this.filelist) {
 							this.filelist.forEach((item, index) => {
 								if (item.empty == false) {
-									data.forEach((nale, ixde) => {
-										if (item.name == nale.name) {
-											data[ixde] = item
-										}
-									})
+									if(item.name=='3、审批后资料'){
+										item.tree.forEach((nale,ixde)=>{
+											if(nale.url==data[0].url){
+												data[0].tree=nale.tree
+											}
+										})
+									}
 								}
 							})
 						}
@@ -2054,11 +2133,11 @@
 			// 上传文件
 			handleChang(file) {
 				let that = this;
-			 let formData = new FormData();
+				let formData = new FormData();
 				formData.append('file', file.raw);
-			 formData.append('type', 2);
+				formData.append('type', 2);
 				formData.append('id', this.getexaminefileid.id);
-				formData.append('destfolder', this.selectFileName + '资料');
+				formData.append('destfolder', this.selectFileNameUrl);
 				that.$http.post('api/auth/file/upload', formData).then((res) => {
 					if (res.status == 200 && res.data.code == 0) {
 						that.$message.success("上传文件成功!");