Browse Source

Merge branch 'master' of http://110.41.152.237:3222/cixizhengqian/cx-wed

# Conflicts:
#	src/components/subject/projectplan/stateOwnedLandAcquisition/relocatehousehold.vue
yjl 2 years ago
parent
commit
32acc09159

+ 3 - 0
src/components/assembly/agreement.vue

@@ -1990,6 +1990,7 @@
 		},
 		methods: {
 			doPrintA() {
+				console.log("打印----");
 				this.$nextTick(function() {
 					//判断iframe是否存在,不存在则创建iframe
 					var iframe = document.getElementById("print-iframe");
@@ -2014,6 +2015,8 @@
 						document.body.removeChild(iframe);
 					}
 				})
+				console.log("iframe-------",iframe)
+				console.log("doc----------",doc);
 			},
 			doPrintB() {
 				this.$nextTick(function() {

File diff suppressed because it is too large
+ 331 - 266
src/components/subject/projectplan/stateOwnedLandAcquisition/agreement/Resettlement.vue


+ 822 - 684
src/components/subject/projectplan/stateOwnedLandAcquisition/relocatehousehold.vue

@@ -32,7 +32,7 @@
 							</el-select>
 						</div>
 						<div class="button-background">
-							<el-button @click="getList();page = 1">查询</el-button>
+							<el-button @click="getList(); page = 1">查询</el-button>
 						</div>
 					</div>
 					<div class="relocate-name-one-top-right">
@@ -42,52 +42,44 @@
 								<li><i class="el-icon-download"></i><span>导出模板</span></li>
 								<el-dropdown-menu>
 									<el-dropdown-item>
-										<span
-											@click="exportdata('api/auth/householdcx/exportExcelZZCQDHE')">住宅产权调换模板</span>
+										<span @click="exportdata('api/auth/householdcx/exportExcelZZCQDHE')">住宅产权调换模板</span>
 									</el-dropdown-item>
 									<el-dropdown-item>
-										<span
-											@click="exportdata('api/auth/householdcx/exportExcelZZHBBC')">住宅货币补偿模板</span>
+										<span @click="exportdata('api/auth/householdcx/exportExcelZZHBBC')">住宅货币补偿模板</span>
 									</el-dropdown-item>
 									<el-dropdown-item>
-										<span
-											@click="exportdata('api/auth/householdcx/exportExcelFZZCQDHE')">非住宅产权调换模板</span>
+										<span @click="exportdata('api/auth/householdcx/exportExcelFZZCQDHE')">非住宅产权调换模板</span>
 									</el-dropdown-item>
 									<el-dropdown-item>
-										<span
-											@click="exportdata('api/auth/householdcx/exportExcelFZZHBBC')">非住宅货币补偿模板</span>
+										<span @click="exportdata('api/auth/householdcx/exportExcelFZZHBBC')">非住宅货币补偿模板</span>
 									</el-dropdown-item>
-									
+
 								</el-dropdown-menu>
 							</el-dropdown>
 							<el-dropdown>
 								<li><i class="el-icon-upload2"></i><span>导入数据</span></li>
 								<el-dropdown-menu>
 									<el-dropdown-item>
-										<el-upload :action="exportExcelOneURL" :data="householdcxData"
-											:headers="tokenData" :show-file-list="false"
-											:on-success="householdcxSucces">
+										<el-upload :action="exportExcelOneURL" :data="householdcxData" :headers="tokenData"
+											:show-file-list="false" :on-success="householdcxSucces">
 											<span>住宅产权调换</span>
 										</el-upload>
 									</el-dropdown-item>
 									<el-dropdown-item>
-										<el-upload :action="exportExcelTwoURL" :data="householdcxData"
-											:headers="tokenData" :show-file-list="false"
-											:on-success="householdcxSucces">
+										<el-upload :action="exportExcelTwoURL" :data="householdcxData" :headers="tokenData"
+											:show-file-list="false" :on-success="householdcxSucces">
 											<span>住宅货币补偿</span>
 										</el-upload>
 									</el-dropdown-item>
 									<el-dropdown-item>
-										<el-upload :action="exportExcelThreeurl" :data="householdcxData"
-											:headers="tokenData" :show-file-list="false"
-											:on-success="householdcxSucces">
+										<el-upload :action="exportExcelThreeurl" :data="householdcxData" :headers="tokenData"
+											:show-file-list="false" :on-success="householdcxSucces">
 											<span>非住宅产权调换</span>
 										</el-upload>
 									</el-dropdown-item>
 									<el-dropdown-item>
-										<el-upload :action="exportExcelFourURL" :data="householdcxData"
-											:headers="tokenData" :show-file-list="false"
-											:on-success="householdcxSucces">
+										<el-upload :action="exportExcelFourURL" :data="householdcxData" :headers="tokenData"
+											:show-file-list="false" :on-success="householdcxSucces">
 											<span>非住宅货币补偿</span>
 										</el-upload>
 									</el-dropdown-item>
@@ -101,13 +93,13 @@
 						<el-table :data="ImportInformation.list" height="566" align="center">
 							<el-table-column prop="moveBackCode" label="编号">
 							</el-table-column>
-							<el-table-column prop="householderName" label="户主姓名" >
+							<el-table-column prop="householderName" label="户主姓名">
 							</el-table-column>
 							<el-table-column prop="householderIdCard" label="户主身份证号">
 							</el-table-column>
 							<el-table-column prop="street" label="房屋坐落">
 								<template slot-scope="scope">
-									<span>{{scope.row.oldHouseAddress}}</span>
+									<span>{{ scope.row.oldHouseAddress }}</span>
 								</template>
 							</el-table-column>
 							<!-- <el-table-column prop="oldHouseAddress" label="原房地址">
@@ -126,8 +118,8 @@
 					</div>
 				</div>
 				<div class="block" style="margin-bottom: 0;">
-					<el-pagination :total="ImportInformation.totalCount" @current-change="handleCurrentChange"
-						 background hide-on-single-page :current-page.sync="page" :page-size="10" layout="total,prev, pager, next, jumper">
+					<el-pagination :total="ImportInformation.totalCount" @current-change="handleCurrentChange" background
+						hide-on-single-page :current-page.sync="page" :page-size="10" layout="total,prev, pager, next, jumper">
 					</el-pagination>
 				</div>
 			</div>
@@ -136,20 +128,19 @@
 		<div class="al">
 			<el-drawer size='50%' :visible.sync="sethousehold" :with-header="false">
 				<div class="tc-top">
-					<h2>{{datahousehold.householderName}}</h2>
+					<h2>{{ datahousehold.householderName }}</h2>
 				</div>
 				<div class="tca-menu">
 					<div id="header">
-						<div class="item_box" @click="householdindex=0" :class="householdindex==0?'active':''">
+						<div class="item_box" @click="householdindex = 0" :class="householdindex == 0 ? 'active' : ''">
 							详细资料
 						</div>
-						<div class="item_box" @click="householdindex=1;getfile()"
-							:class="householdindex==1?'active':''">
+						<div class="item_box" @click="householdindex = 1; getfile()" :class="householdindex == 1 ? 'active' : ''">
 							拆迁户资料
 						</div>
 					</div>
 				</div>
-				<div class="tc-middle" v-if="householdindex==0">
+				<div class="tc-middle" v-if="householdindex == 0">
 					<h3>征迁信息:</h3>
 					<div class="arrr">
 						<div class="form" style="padding: 0;">
@@ -200,31 +191,31 @@
 								<el-form-item label="住房困难补助金额(元)" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.housingDifficultiesSubsidy" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item v-if="datahousehold.levyHouseNature=='住宅'&&datahousehold.placementWay=='产权调换'"
-								 label="折算的安置面积(元)" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '住宅' && datahousehold.placementWay == '产权调换'"
+									label="折算的安置面积(元)" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.convertedArea" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item v-if="datahousehold.levyHouseNature=='住宅'&&datahousehold.placementWay=='产权调换'"
-								 label="产权调换面积补助(㎡)" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '住宅' && datahousehold.placementWay == '产权调换'"
+									label="产权调换面积补助(㎡)" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.exchangeSubsidy" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item v-if="datahousehold.levyHouseNature=='住宅'&&datahousehold.placementWay=='产权调换'"
-								 label="增加面积(㎡)" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '住宅' && datahousehold.placementWay == '产权调换'"
+									label="增加面积(㎡)" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.increasedArea" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item v-if="datahousehold.levyHouseNature=='住宅'&&datahousehold.placementWay=='产权调换'"
-								 label="上靠面积(㎡)" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '住宅' && datahousehold.placementWay == '产权调换'"
+									label="上靠面积(㎡)" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.upperArea" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item v-if="datahousehold.levyHouseNature=='住宅'&&datahousehold.placementWay=='产权调换'" 
-								label="预期合计建筑面积(㎡)" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '住宅' && datahousehold.placementWay == '产权调换'"
+									label="预期合计建筑面积(㎡)" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.expectedTotalBuiltUpArea" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item v-if="datahousehold.levyHouseNature=='住宅'&&datahousehold.placementWay=='产权调换'" 
-								 label="实际合计建筑面积(㎡)" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '住宅' && datahousehold.placementWay == '产权调换'"
+									label="实际合计建筑面积(㎡)" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.realTotalBuiltUpArea" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item  label="一次性搬迁补偿费(元)" label-width="180px" prop="projectName">
+								<el-form-item label="一次性搬迁补偿费(元)" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.relocationCompensation" autocomplete="off"></el-input>
 								</el-form-item>
 								<el-form-item label="临时安置补偿费(元)" label-width="180px" prop="projectName">
@@ -245,61 +236,61 @@
 								<el-form-item label="应核减房改购房资金(元)" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.shouldSubtracted" autocomplete="off"></el-input>
 								</el-form-item>
-								
-								<el-form-item v-if="datahousehold.levyHouseNature=='住宅'&&datahousehold.placementWay=='货币补偿'" 
-								 label="货币补偿补助金额" label-width="180px" prop="projectName">
+
+								<el-form-item v-if="datahousehold.levyHouseNature == '住宅' && datahousehold.placementWay == '货币补偿'"
+									label="货币补偿补助金额" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.monetaryCompensation" autocomplete="off"></el-input>
 								</el-form-item>
-								
-								<el-form-item v-if="datahousehold.levyHouseNature=='非住宅'&&datahousehold.placementWay=='产权调换'" 
-								 label="土地面积(㎡)" label-width="180px" prop="projectName">
+
+								<el-form-item v-if="datahousehold.levyHouseNature == '非住宅' && datahousehold.placementWay == '产权调换'"
+									label="土地面积(㎡)" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.fzzLandArea" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item  v-if="datahousehold.levyHouseNature=='非住宅'&&datahousehold.placementWay=='产权调换'" 
-								 label="商业(㎡)" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '非住宅' && datahousehold.placementWay == '产权调换'"
+									label="商业(㎡)" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.businessLandArea" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item  v-if="datahousehold.levyHouseNature=='非住宅'&&datahousehold.placementWay=='产权调换'" 
-								 label="办公(㎡)" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '非住宅' && datahousehold.placementWay == '产权调换'"
+									label="办公(㎡)" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.workLandArea" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item  v-if="datahousehold.levyHouseNature=='非住宅'&&datahousehold.placementWay=='产权调换'" 
-								 label="工业(㎡)" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '非住宅' && datahousehold.placementWay == '产权调换'"
+									label="工业(㎡)" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.industryLandArea" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item v-if="datahousehold.levyHouseNature=='非住宅'&&datahousehold.placementWay=='产权调换'" 
-								 label="仓储(㎡)" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '非住宅' && datahousehold.placementWay == '产权调换'"
+									label="仓储(㎡)" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.storageLandArea" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item v-if="datahousehold.levyHouseNature=='非住宅'&&datahousehold.placementWay=='产权调换'" 
-								 label="商业用房" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '非住宅' && datahousehold.placementWay == '产权调换'"
+									label="商业用房" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.businessAmount" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item v-if="datahousehold.levyHouseNature=='非住宅'&&datahousehold.placementWay=='产权调换'" 
-								 label="办公用房" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '非住宅' && datahousehold.placementWay == '产权调换'"
+									label="办公用房" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.workAmount" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item v-if="datahousehold.levyHouseNature=='非住宅'&&datahousehold.placementWay=='产权调换'" 
-								 label="工业用房" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '非住宅' && datahousehold.placementWay == '产权调换'"
+									label="工业用房" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.industryAmount" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item v-if="datahousehold.levyHouseNature=='非住宅'&&datahousehold.placementWay=='产权调换'" 
-								 label="仓储用房" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '非住宅' && datahousehold.placementWay == '产权调换'"
+									label="仓储用房" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.storageAmount" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item v-if="datahousehold.levyHouseNature=='非住宅'&&datahousehold.placementWay=='产权调换'" 
-								 label="停业停产损失费" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '非住宅' && datahousehold.placementWay == '产权调换'"
+									label="停业停产损失费" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.closureLoss" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item v-if="datahousehold.levyHouseNature=='非住宅'&&datahousehold.placementWay=='产权调换'" 
-								 label="一次性搬迁和临时安置费" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '非住宅' && datahousehold.placementWay == '产权调换'"
+									label="一次性搬迁和临时安置费" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.relocationAndTemporaryResettlement" autocomplete="off"></el-input>
 								</el-form-item>
-								<el-form-item v-if="datahousehold.levyHouseNature=='非住宅'&&datahousehold.placementWay=='产权调换'" 
-								 label="重大设施搬迁损失费" label-width="180px" prop="projectName">
+								<el-form-item v-if="datahousehold.levyHouseNature == '非住宅' && datahousehold.placementWay == '产权调换'"
+									label="重大设施搬迁损失费" label-width="180px" prop="projectName">
 									<el-input v-model="datahousehold.importantFacilitiesLoss" autocomplete="off"></el-input>
 								</el-form-item>
-								
+
 								<el-form-item label="装修附属物评估金额(元)" label-width="200px" prop="projectName">
 									<el-input v-model="datahousehold.renovationAmount" autocomplete="off"></el-input>
 								</el-form-item>
@@ -308,36 +299,35 @@
 								</el-form-item>
 							</el-form>
 						</div>
-						<div class="tc-middle-add" v-if="datahousehold.placementWay=='产权调换'">
+						<div class="tc-middle-add" v-if="datahousehold.placementWay == '产权调换'">
 							<h3>已分配房源:</h3>
 						</div>
-						<div class="WithoutInterval" v-if="datahousehold.placementWay=='产权调换'">
-							<el-table :data="stateownedhouseList" :header-cell-style="{background:'#e2e2e2'}" style="width: 100%">
-								<el-table-column prop="realHouseAddress" label="实际房屋坐落" >
+						<div class="WithoutInterval" v-if="datahousehold.placementWay == '产权调换'">
+							<el-table :data="stateownedhouseList" :header-cell-style="{ background: '#e2e2e2' }" style="width: 100%">
+								<el-table-column prop="realHouseAddress" label="实际房屋坐落">
 								</el-table-column>
 								<el-table-column prop="realHouseArea" label="实际房屋面积(㎡)">
 								</el-table-column>
-								<el-table-column prop="houseUse" label="用途"
-									v-if="datahousehold.levyHouseNature=='非住宅'" >
+								<el-table-column prop="houseUse" label="用途" v-if="datahousehold.levyHouseNature == '非住宅'">
 								</el-table-column>
-								<el-table-column prop="landArea" label="土地面积(㎡)"
-								v-if="datahousehold.levyHouseNature=='非住宅'" >
+								<el-table-column prop="landArea" label="土地面积(㎡)" v-if="datahousehold.levyHouseNature == '非住宅'">
 								</el-table-column>
 							</el-table>
 						</div>
 					</div>
 				</div>
-				<div class="nrya" style="width: 100%;height: calc(100% - 112px);" v-if="householdindex==1">
-					<file-manage type="2" :fileId='householdId' ref="file" :loadFileList='loadFileList':authority='2'>
+				<div class="nrya" style="width: 100%;height: calc(100% - 112px);" v-if="householdindex == 1">
+					<file-manage type="2" :fileId='householdId' ref="file" :loadFileList='loadFileList' :authority='2'>
 					</file-manage>
 				</div>
 			</el-drawer>
 		</div>
 		<!-- 导入错误 -->
 		<div class="tk">
-			<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>
+			<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>
 				</div>
 			</el-dialog>
 		</div>
@@ -356,45 +346,43 @@
 							</div>
 							<div class="PlanningLibrary-left-data">
 								<ul>
-									<li :class="AgreementIndex==0?'Check':''" @click="AgreementIndex=0"><i
-											class="el-icon-menu"></i>
+									<li :class="AgreementIndex == 0 ? 'Check' : ''" @click="AgreementIndex = 0"><i class="el-icon-menu"></i>
 										<Tooltip text="住宅房屋征收产权调换协议"></Tooltip>
 									</li>
-									<li :class="AgreementIndex==1?'Check':''" @click="AgreementIndex=1"><i
-											class="el-icon-menu"></i>
+									<li :class="AgreementIndex == 1 ? 'Check' : ''" @click="AgreementIndex = 1"><i class="el-icon-menu"></i>
 										<Tooltip text="住宅房屋征收产权调换协议"></Tooltip>
 									</li>
-									<li :class="AgreementIndex==2?'Check':''" @click="AgreementIndex=2"><i
-											class="el-icon-menu"></i>
+									<li :class="AgreementIndex == 2 ? 'Check' : ''" @click="AgreementIndex = 2"><i class="el-icon-menu"></i>
 										<Tooltip text="非住宅房屋征收产权调换协议"></Tooltip>
 									</li>
-									<li :class="AgreementIndex==3?'Check':''" @click="AgreementIndex=3"><i
-											class="el-icon-menu"></i>
+									<li :class="AgreementIndex == 3 ? 'Check' : ''" @click="AgreementIndex = 3"><i class="el-icon-menu"></i>
 										<Tooltip text="直管公有非住宅房屋征收产权调换补偿协议"></Tooltip>
 									</li>
-									<li :class="AgreementIndex==4?'Check':''" @click="AgreementIndex=4"><i
-											class="el-icon-menu"></i>
+									<li :class="AgreementIndex == 4 ? 'Check' : ''" @click="AgreementIndex = 4"><i class="el-icon-menu"></i>
 										<Tooltip text="非住宅房屋征收补偿协议"></Tooltip>
 									</li>
-									<li :class="AgreementIndex==5?'Check':''" @click="AgreementIndex=5"><i
-											class="el-icon-menu"></i>
+									<li :class="AgreementIndex == 5 ? 'Check' : ''" @click="AgreementIndex = 5"><i class="el-icon-menu"></i>
 										<Tooltip text="直管公有非住宅房屋征收货币补偿协议"></Tooltip>
 									</li>
-									<li :class="AgreementIndex==6?'Check':''" @click="AgreementIndex=6"><i
-											class="el-icon-menu"></i>
+									<li :class="AgreementIndex == 6 ? 'Check' : ''" @click="AgreementIndex = 6"><i class="el-icon-menu"></i>
 										<Tooltip text="住宅房屋征收补偿协议"></Tooltip>
 									</li>
-									<li :class="AgreementIndex==7?'Check':''" @click="AgreementIndex=7"><i
-											class="el-icon-menu"></i>
+									<li :class="AgreementIndex == 7 ? 'Check' : ''" @click="AgreementIndex = 7"><i class="el-icon-menu"></i>
 										<Tooltip text="住宅房屋征收产权调换协议(房票安置)"></Tooltip>
 									</li>
+									<li :class="AgreementIndex == 8 ? 'Check' : ''" @click="AgreementIndex = 8"><i class="el-icon-menu"></i>
+										<Tooltip text="住宅房屋征收产权调换结算单"></Tooltip>
+									</li>
+									<li :class="AgreementIndex == 9 ? 'Check' : ''" @click="AgreementIndex = 9"><i class="el-icon-menu"></i>
+										<Tooltip text="住宅房屋征收货币补偿结算单"></Tooltip>
+									</li>
 								</ul>
 							</div>
 						</div>
 					</div>
 					<div class="agreement-right">
-						<Resettlement :agreement='AgreementIndex' :datahousehold='datahousehold'
-							:strpdetails='strpdetails'></Resettlement>
+						<Resettlement :agreement='AgreementIndex' :datahousehold='datahousehold' :strpdetails='strpdetails'>
+						</Resettlement>
 					</div>
 				</div>
 			</el-dialog>
@@ -407,6 +395,7 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 	import Tooltip from '../../../assembly/tooltip.vue'
 	import fileManage from '../../../assembly/file.vue'
 	import Resettlement from './agreement/Resettlement.vue'
@@ -460,16 +449,94 @@
 				//户id
 				loadFileList:['被拆迁人家庭人口情况表','户口簿','婚姻状况证明','家庭成员关系证明','大中专毕业生入学办理农转非证明','非农户口未享受过城镇住房保障政策证明','其他'],
 				householdId: ''
+=======
+import Tooltip from '../../../assembly/tooltip.vue'
+import fileManage from '../../../assembly/file.vue'
+import Resettlement from './agreement/Resettlement.vue'
+
+export default {
+	name: "survey",
+	props: ['strpdetails', 'authority'],
+	components: {
+		fileManage,
+		Tooltip,
+		Resettlement
+	},
+	data() {
+		return {
+			//签协议控制
+			coverControl: true,
+			AgreementIndex: 0,
+			//=====导入======
+			exportExcelOneURL: window.sessionStorage.getItem('url') + 'api/auth/householdcx/importExcelZZCQDHE',
+			exportExcelTwoURL: window.sessionStorage.getItem('url') + 'api/auth/householdcx/importExcelZZHBBC',
+			exportExcelThreeurl: window.sessionStorage.getItem('url') + 'api/auth/householdcx/importExcelFZZCQDH',
+			exportExcelFourURL: window.sessionStorage.getItem('url') + 'api/auth/householdcx/importExcelFZZHBBC',
+			tokenData: {
+				token: window.sessionStorage.getItem('token')
+			},
+			householdcxData: {
+				projectId: '',
+			},
+			//上传错误
+			errorControl: false,
+			errorData: '',
+			//=====查询======
+			householderName: '', //姓名
+			householderIdCard: '', //户主身份证、
+			levyHouseNature: '',//房屋类型
+			placementWay: '',//房屋类型
+			page: 1, //页码
+			ImportInformation: {}, //征迁户列表
+
+			stateownedhouseList: [],//已分配房源
+
+			//查看
+			sethousehold: false,
+			datahousehold: [],
+			activeName: '1', //手风琴
+			householdindex: 0,
+			//户id
+			loadFileList: ['被拆迁人家庭人口情况表', '户口簿', '婚姻状况证明', '家庭成员关系证明', '大中专毕业生入学办理农转非证明', '非农户口未享受过城镇住房保障政策证明', '其他'],
+			householdId: ''
+		}
+	},
+	watch: {},
+	computed: {},
+	mounted() {
+		if (!this.$route.query.projectId) {
+			this.householdcxData.projectId = this.strpdetails.bussiness.id
+		}
+		this.getList()
+	},
+	methods: {
+		getList(row) {
+			var url
+			if (this.$route.query.projectId) {
+				url = 'api/auth/householdcx/problemlist'
+			} else {
+				url = 'api/auth/householdcx/list'
+>>>>>>> ede843d9c03e3ff6337d226eadc8bad42f9207f1
 			}
+			this.$http.get(`${url}?projectId=` + this.strpdetails.bussiness.id + '&page=' + this.page + '&list=' + 10 + '&householderName=' + this.householderName + '&householderIdCard=' + this.householderIdCard + '&levyHouseNature=' + this.levyHouseNature + '&placementWay=' + this.placementWay, null).then((res) => {
+				if (res.status == 200 && res.data.code == 0) {
+					this.ImportInformation = res.data.page
+				} else {
+					this.$message.error("提交失败!");
+				}
+			});
 		},
-		watch: {},
-		computed:{},
-		mounted() {
-			if(!this.$route.query.projectId){
-				this.householdcxData.projectId = this.strpdetails.bussiness.id
-			}
-			this.getList()
+		//获取已分配房源获取失败
+		async gethousehoid(row) {
+			await this.$http.get('api/auth/stateownedhouse/list?householdId=' + row, null).then((res) => {
+				if (res.status == 200 && res.data.code == 0) {
+					this.stateownedhouseList = res.data.page
+				} else {
+					this.$message.error("获取失败!");
+				}
+			})
 		},
+<<<<<<< HEAD
 		methods: {
 			getList(row) {
 					var url
@@ -490,720 +557,791 @@
 			//获取已分配房源获取失败
 			async gethousehoid(row) {
 				await this.$http.get('api/auth/stateownedhouse/list?householdId=' + row, null).then((res) => {
+=======
+		// 页码
+		handleCurrentChange(val) {
+			this.page = val;
+			this.getList();
+		},
+		smallhouseholdcx(row) {
+			var data = []
+			data.push(row.id)
+			this.$confirm('确定要删除该拆迁户吗?').then(_ => {
+				this.$http.post("api/auth/householdcx/delete", data).then((res) => {
+>>>>>>> ede843d9c03e3ff6337d226eadc8bad42f9207f1
 					if (res.status == 200 && res.data.code == 0) {
-						this.stateownedhouseList = res.data.page
+						this.getList()
+						this.$message.success("删除成功!");
 					} else {
-						this.$message.error("获取失败!");
+						this.$message.error("删除失败!");
 					}
-				})
-			},
-			// 页码
-			handleCurrentChange(val) {
-				this.page = val;
-				this.getList();
-			},
-			smallhouseholdcx(row) {
-				var data = []
-				data.push(row.id)
-				this.$confirm('确定要删除该拆迁户吗?').then(_ => {
-					this.$http.post("api/auth/householdcx/delete", data).then((res) => {
-						if (res.status == 200 && res.data.code == 0) {
-							this.getList()
-							this.$message.success("删除成功!");
-						} else {
-							this.$message.error("删除失败!");
-						}
-					});
-				})
-			},
-			// 导出模板
-			exportdata(row) {
-				var url = row + '?projectId=' + this.strpdetails.bussiness.id
-				this.$http.get(url, {
-					responseType: 'blob'
-				}, null).then((res) => {
-					var name = res.headers['content-disposition']
-					var index = res.headers['content-disposition'].lastIndexOf("=");
-					name = decodeURIComponent(name.substring(index + 6, name.length))
-					if (res.headers['content-type'] == "application/octet-stream;charset=utf-8" || res.headers[
-							'content-type'] == "application/octet-stream;charset=UTF-8") {
-						const content = res.data
-						const blob = new Blob([content], {
-							type: res.data.type
-						}) //构造一个blob对象来处理数据
-						const fileName = name
-						if ('download' in document.createElement('a')) { //支持a标签download的浏览器
-							const link = document.createElement('a') //创建a标签
-							link.download = fileName //a标签添加属性
-							link.style.display = 'none'
-							link.href = URL.createObjectURL(blob)
-							document.body.appendChild(link)
-							link.click() //执行下载
-							URL.revokeObjectURL(link.href) //释放url
-							document.body.removeChild(link) //释放标签
-						} else { //其他浏览器
-							navigator.msSaveBlob(blob, fileName)
-						}
-					} else {
-						this.$message.error('下载文件失败!');
+				});
+			})
+		},
+		// 导出模板
+		exportdata(row) {
+			var url = row + '?projectId=' + this.strpdetails.bussiness.id
+			this.$http.get(url, {
+				responseType: 'blob'
+			}, null).then((res) => {
+				var name = res.headers['content-disposition']
+				var index = res.headers['content-disposition'].lastIndexOf("=");
+				name = decodeURIComponent(name.substring(index + 6, name.length))
+				if (res.headers['content-type'] == "application/octet-stream;charset=utf-8" || res.headers[
+					'content-type'] == "application/octet-stream;charset=UTF-8") {
+					const content = res.data
+					const blob = new Blob([content], {
+						type: res.data.type
+					}) //构造一个blob对象来处理数据
+					const fileName = name
+					if ('download' in document.createElement('a')) { //支持a标签download的浏览器
+						const link = document.createElement('a') //创建a标签
+						link.download = fileName //a标签添加属性
+						link.style.display = 'none'
+						link.href = URL.createObjectURL(blob)
+						document.body.appendChild(link)
+						link.click() //执行下载
+						URL.revokeObjectURL(link.href) //释放url
+						document.body.removeChild(link) //释放标签
+					} else { //其他浏览器
+						navigator.msSaveBlob(blob, fileName)
 					}
-				})
-			},
-			//导入数据成功后操作
-			householdcxSucces(res) {
-				if (res.code == 0) {
-					this.$message.success('导入成功!');
-					this.getList()
-				}else if (res.errorMsgs) {
-					// this.$message.error(res.errorMsgs);
-					this.errorData=res.errorMsgs
-					this.errorControl=true
+				} else {
+					this.$message.error('下载文件失败!');
 				}
-				 else {
-					this.$message.error(res.msg);
-				}
-			},
-			edititem(row) {
-				this.activeName = '1'
-				this.householdindex = 0
-				this.sethousehold = true
-				this.datahousehold = JSON.parse(JSON.stringify(row))
-				this.householdId = row.id
-				this.gethousehoid(row.id)
-			},
-			SignSgreement(row) {
-				this.AgreementIndex=0
-				this.datahousehold = JSON.parse(JSON.stringify(row))
-				this.coverControl = true
-			},
-			// 获取文件
-			getfile() {
-				this.$nextTick(res => {
-					this.$refs.file.getList();
-				})
+			})
+		},
+		//导入数据成功后操作
+		householdcxSucces(res) {
+			if (res.code == 0) {
+				this.$message.success('导入成功!');
+				this.getList()
+			} else if (res.errorMsgs) {
+				// this.$message.error(res.errorMsgs);
+				this.errorData = res.errorMsgs
+				this.errorControl = true
 			}
+			else {
+				this.$message.error(res.msg);
+			}
+		},
+		edititem(row) {
+			this.activeName = '1'
+			this.householdindex = 0
+			this.sethousehold = true
+			this.datahousehold = JSON.parse(JSON.stringify(row))
+			this.householdId = row.id
+			this.gethousehoid(row.id)
+		},
+		SignSgreement(row) {
+			this.AgreementIndex = 0
+			this.datahousehold = JSON.parse(JSON.stringify(row))
+			this.coverControl = true
+		},
+		// 获取文件
+		getfile() {
+			this.$nextTick(res => {
+				this.$refs.file.getList();
+			})
 		}
 	}
+}
 </script>
 
 <style scoped lang="less">
-	//签约审核
-	.indexControl{
-		.indexControl-ont{
-			.indexControl-ont-title{
-				font-size: 14px;
-				color: #999999;
-				margin: 10px 0;
-				}
-				ul{
-					display: flex;
-					flex-wrap: wrap;
-					li{
-						cursor: pointer;
-						width: 23%;
-						margin:0 1% ;
-						margin-bottom: 10px;
-						div{
-						// width: 60px;
+//签约审核
+.indexControl {
+	.indexControl-ont {
+		.indexControl-ont-title {
+			font-size: 14px;
+			color: #999999;
+			margin: 10px 0;
+		}
+
+		ul {
+			display: flex;
+			flex-wrap: wrap;
+
+			li {
+				cursor: pointer;
+				width: 23%;
+				margin: 0 1%;
+				margin-bottom: 10px;
+
+				div {
+					// width: 60px;
+					text-align: center;
+
+					// margin: 0 auto;
+					div {
+						width: 55px;
+						height: 55px;
+						// background-color: #FA922E;
+						margin: 0 auto;
+					}
+
+					span {
 						text-align: center;
-						// margin: 0 auto;
-						div{
-							width: 55px;
-							height: 55px;
-							// background-color: #FA922E;
-							margin: 0 auto;
-						}
-						span{
-							text-align: center;
-							margin-bottom: 5px;
-							display: block;
-						}
-						.tooltip-wrap {
-						   margin: 0 2px;
-						   overflow: hidden;
-						   text-overflow: ellipsis;
-						   word-break: break-all;
-						   font-size: 14px;
-						   display: inline-block;
-						   display: -webkit-box !important;
-						   -webkit-line-clamp: 1;
-						   -webkit-box-orient: vertical;
-						 }
-						 
-						 .tooltip-wrap span {
+						margin-bottom: 5px;
+						display: block;
+					}
+
+					.tooltip-wrap {
+						margin: 0 2px;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						word-break: break-all;
+						font-size: 14px;
+						display: inline-block;
+						display: -webkit-box !important;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+					}
+
+					.tooltip-wrap span {
 						/*   line-height: 1px; */
-						   display: initial;
-						   white-space: break-spaces;
-						 }
-						p{
-							margin: 0 auto;
-							width: 60px;
-							color: #fff;
-							background-color: #55bf9c;
-							border-radius: 5px;
-						}
-						}
+						display: initial;
+						white-space: break-spaces;
+					}
+
+					p {
+						margin: 0 auto;
+						width: 60px;
+						color: #fff;
+						background-color: #55bf9c;
+						border-radius: 5px;
 					}
 				}
+			}
 		}
 	}
-	.toexamine{
+}
+
+.toexamine {
+	width: 100%;
+	height: 500px;
+
+	// min-height: 500px;
+	.nrya {
 		width: 100%;
-		height: 500px;
-		// min-height: 500px;
-		.nrya {
-		  width: 100%;
-		  height: 100%;
-		  display: flex;
-		  .rt-nr {
-		    width: 30%;
-		    height: 100%;
-		    overflow: auto;
+		height: 100%;
+		display: flex;
+
+		.rt-nr {
+			width: 30%;
+			height: 100%;
+			overflow: auto;
+
 			/* // 将每一行的设置为相对定位 方便后面before after 使用绝对定位来固定位置 */
 			/deep/.el-tree .el-tree-node {
-			  position: relative;
-			  padding-left: 10px;
+				position: relative;
+				padding-left: 10px;
 			}
+
 			/* // 子集像右偏移 给数线留出距离 */
 			/deep/.el-tree .el-tree-node__children {
-			  padding: 10px 0 0 30px !important;
+				padding: 10px 0 0 30px !important;
 			}
+
 			/* //这是竖线 */
 			/deep/.el-tree .el-tree-node :last-child:before {
-			  height: 40px;
+				height: 40px;
 			}
+
 			/deep/.el-tree .el-tree>.el-tree-node:before {
-			  border-left: none;
+				border-left: none;
 			}
+
 			/deep/.el-tree .el-tree>.el-tree-node:after {
-			  border-top: none;
+				border-top: none;
 			}
+
 			/* //这自定义的线 的公共部分 */
 			/deep/.el-tree .el-tree-node:before,
 			/deep/.el-tree-node:after {
-			  content: "";
-			  left: -4px;
-			  position: absolute;
-			  right: auto;
-			  border-width: 1px;
+				content: "";
+				left: -4px;
+				position: absolute;
+				right: auto;
+				border-width: 1px;
 			}
+
 			/deep/.el-tree .tree :first-child .el-tree-node:before {
-			  border-left: none;
+				border-left: none;
 			}
+
 			/* // 竖线 */
 			/deep/.el-tree .el-tree-node:before {
-			  border-left: 1px solid #b5b5b5;
-			  bottom: 0px;
-			  height: 100%;
-			  top: -25px;
-			  width: 1px;
+				border-left: 1px solid #b5b5b5;
+				bottom: 0px;
+				height: 100%;
+				top: -25px;
+				width: 1px;
 			}
+
 			/* //横线 */
 			/deep/.el-tree .el-tree-node:after {
-			  border-top: 1px solid #b5b5b5;
-			  height: 20px;
-			  top: 14px;
-			  width: 24px;
+				border-top: 1px solid #b5b5b5;
+				height: 20px;
+				top: 14px;
+				width: 24px;
 			}
+
 			/deep/.el-tree .el-tree-node__expand-icon.is-leaf {
-			  width: 8px;
+				width: 8px;
 			}
+
 			/* //去掉elementui自带的展开按钮  一个向下的按钮,打开时向右 */
 			/deep/.el-tree .el-tree-node__content>.el-tree-node__expand-icon {
-			  display: none;
+				display: none;
 			}
+
 			/deep/ .el-tree-node__content {
-			  padding-left: 0px !important;
+				padding-left: 0px !important;
 			}
+
 			/* //每一行的高度 */
 			/deep/.el-tree>div:before {
-			  display: none;
+				display: none;
 			}
+
 			/deep/.el-tree>div:after {
-			  display: none;
+				display: none;
 			}
+
 			/deep/.el-tree-node.is-expanded>.el-tree-node__children {
-			  padding: 10px 0 0 30px !important;
+				padding: 10px 0 0 30px !important;
 			}
+
 			.fbtn {
-			  color: #aaa;
-			  font-size: 12px;
-			  display: none !important;
-			  margin: 0 2%;
+				color: #aaa;
+				font-size: 12px;
+				display: none !important;
+				margin: 0 2%;
 			}
-			
+
 			.custom-tree-node:hover .fbtn {
-			  display: inline !important;
+				display: inline !important;
 			}
+
 			.tooltip-wrap {
-			  margin: 0 2px;
-			  max-width: 59%;
-			  overflow: hidden;
-			  text-overflow: ellipsis;
-			  word-break: break-all;
-			  font-size: 14px;
-			  display: inline-block;
-			  display: -webkit-box !important;
-			  -webkit-line-clamp: 1;
-			  -webkit-box-orient: vertical;
-			  span {
-			    line-height: 1px;
-			    display: initial;
-			    white-space: break-spaces;
-			  }
+				margin: 0 2px;
+				max-width: 59%;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				word-break: break-all;
+				font-size: 14px;
+				display: inline-block;
+				display: -webkit-box !important;
+				-webkit-line-clamp: 1;
+				-webkit-box-orient: vertical;
+
+				span {
+					line-height: 1px;
+					display: initial;
+					white-space: break-spaces;
+				}
 			}
-		  }
-		  .rt-nt {
-		    width: 70%;
-		    height: 100%;
+		}
+
+		.rt-nt {
+			width: 70%;
+			height: 100%;
+
 			iframe {
-			  border: 1px solid #ccc;
-			  box-sizing: border-box;
+				border: 1px solid #ccc;
+				box-sizing: border-box;
 			}
-		  }
 		}
 	}
-	.relocate {
-		width: 100%;
-		height: 100%;
-		font-size: 14px;
-		
-		.relocate-top {
-			height: 45px;
-			border-bottom: 1px solid #dedede;
-			display: flex;
-			padding-left: 10px;
-
-			div {
-				height: 44px;
-				line-height: 44px;
-				margin: 0 20px;
-				font-size: 16px;
-				color: #999;
-				font-weight: 500;
-				cursor: pointer;
-			}
+}
 
-			.LeftCheck {
-				border-bottom: 2px solid #167aa1;
-				color: #072a38;
-			}
+.relocate {
+	width: 100%;
+	height: 100%;
+	font-size: 14px;
+
+	.relocate-top {
+		height: 45px;
+		border-bottom: 1px solid #dedede;
+		display: flex;
+		padding-left: 10px;
+
+		div {
+			height: 44px;
+			line-height: 44px;
+			margin: 0 20px;
+			font-size: 16px;
+			color: #999;
+			font-weight: 500;
+			cursor: pointer;
+		}
+
+		.LeftCheck {
+			border-bottom: 2px solid #167aa1;
+			color: #072a38;
 		}
+	}
+
+	.relocate-name {
+		width: 100%;
+		height: calc(100% - 45px);
 
-		.relocate-name {
+		.relocate-name-one {
 			width: 100%;
-			height: calc(100% - 45px);
+			height: 100%;
+			padding: 20px 30px;
+			box-sizing: border-box;
+			overflow-y: auto;
+			overflow-x: hidden;
 
-			.relocate-name-one {
-				width: 100%;
-				height: 100%;
-				padding: 20px 30px;
-				box-sizing: border-box;
-				overflow-y: auto;
-				overflow-x: hidden;
-				& {
-					scrollbar-width: thin;
-					scrollbar-color: #c1c1c1 #eee;
-				}
+			& {
+				scrollbar-width: thin;
+				scrollbar-color: #c1c1c1 #eee;
+			}
 
-				&::-webkit-scrollbar {
-					width: 6px;
-					background-color: #eee;
-				}
+			&::-webkit-scrollbar {
+				width: 6px;
+				background-color: #eee;
+			}
 
-				&::-webkit-scrollbar-thumb {
-					background-color: #c1c1c1;
+			&::-webkit-scrollbar-thumb {
+				background-color: #c1c1c1;
 
-					&:hover {
-						background-color: #a8a8a8;
-					}
+				&:hover {
+					background-color: #a8a8a8;
+				}
 
-					&:active {
-						background-color: #787878;
-					}
+				&:active {
+					background-color: #787878;
 				}
+			}
 
-				.relocate-name-one-top {
+			.relocate-name-one-top {
+				display: flex;
+				margin-bottom: 20px;
+
+				.relocate-name-one-top-left {
+					width: 80%;
+					height: 40px;
 					display: flex;
-					margin-bottom: 20px;
 
-					.relocate-name-one-top-left {
-						width: 80%;
-						height: 40px;
+					div {
 						display: flex;
+						margin-right: 20px;
 
-						div {
-							display: flex;
-							margin-right: 20px;
-
-							span {
-								width: 90px;
-								height: 40px;
-								line-height: 40px;
-								display: block;
-								text-align: right;
-								font-size: 14px;
-								color: #4b4b4b;
-							}
+						span {
+							width: 90px;
+							height: 40px;
+							line-height: 40px;
+							display: block;
+							text-align: right;
+							font-size: 14px;
+							color: #4b4b4b;
+						}
 
-							.el-input {
-								margin: 0;
-								width: calc(100% - 80px);
-							}
+						.el-input {
+							margin: 0;
+							width: calc(100% - 80px);
 						}
+					}
 
-						.button-background {
-							margin-left: 20px;
+					.button-background {
+						margin-left: 20px;
 
-							.el-button {
-								border-radius: 6px;
-							}
+						.el-button {
+							border-radius: 6px;
 						}
 					}
+				}
 
-					.relocate-name-one-top-right {
-						width: 20%;
-						height: 40px;
-
-						ul {
-							display: flex;
-							justify-content: flex-end;
-
-							li {
-								cursor: pointer;
-								width: 90px;
-								line-height: 40px;
-								text-align: center;
-								border: 1px solid #dedede;
-								border-radius: 8px;
-								margin-left: 20px;
-
-								i {
-									font-size: 19px;
-									color: #47a1c4;
-								}
+				.relocate-name-one-top-right {
+					width: 20%;
+					height: 40px;
 
-								span {
-									color: #707070;
-								}
+					ul {
+						display: flex;
+						justify-content: flex-end;
+
+						li {
+							cursor: pointer;
+							width: 90px;
+							line-height: 40px;
+							text-align: center;
+							border: 1px solid #dedede;
+							border-radius: 8px;
+							margin-left: 20px;
+
+							i {
+								font-size: 19px;
+								color: #47a1c4;
+							}
+
+							span {
+								color: #707070;
 							}
 						}
 					}
 				}
+			}
 
-				.relocate-name-one-tow {
-					width: 100%;
-					height: 566px;
-					border: 1px solid #dedede;
+			.relocate-name-one-tow {
+				width: 100%;
+				height: 566px;
+				border: 1px solid #dedede;
 
-					/deep/.WithoutInterval {
-						.el-table th.el-table__cell.is-leaf {
-							background-color: #dedede;
-						}
+				/deep/.WithoutInterval {
+					.el-table th.el-table__cell.is-leaf {
+						background-color: #dedede;
+					}
 
-						.el-table__body-wrapper {
-							scrollbar-width: thin;
-							scrollbar-color: #c1c1c1 #eee;
-						}
+					.el-table__body-wrapper {
+						scrollbar-width: thin;
+						scrollbar-color: #c1c1c1 #eee;
+					}
 
-						.el-table__body-wrapper::-webkit-scrollbar {
-							width: 6px;
-							background-color: #eee;
-						}
+					.el-table__body-wrapper::-webkit-scrollbar {
+						width: 6px;
+						background-color: #eee;
+					}
 
-						.el-table__body-wrapper::-webkit-scrollbar-thumb {
-							background-color: #c1c1c1;
+					.el-table__body-wrapper::-webkit-scrollbar-thumb {
+						background-color: #c1c1c1;
 
-							&:hover {
-								background-color: #a8a8a8;
-							}
+						&:hover {
+							background-color: #a8a8a8;
+						}
 
-							&:active {
-								background-color: #787878;
-							}
+						&:active {
+							background-color: #787878;
 						}
 					}
 				}
 			}
 		}
-		.cover{
-			position: absolute;
-			top: 0;
-			right: 0;
-			width: 100%;
-			height: 100%;
-			z-index: 10;
-			background-color: #00000070;
-			cursor: pointer;
-		}
 	}
 
-	.el-dropdown-menu__item {
-		span {
-			width: 100%;
-			height: 100%;
-			display: block;
-			text-align: center;
-		}
+	.cover {
+		position: absolute;
+		top: 0;
+		right: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 10;
+		background-color: #00000070;
+		cursor: pointer;
+	}
+}
 
-		/deep/ .el-upload {
-			width: 100%;
-		}
+.el-dropdown-menu__item {
+	span {
+		width: 100%;
+		height: 100%;
+		display: block;
+		text-align: center;
 	}
-	.Print {
-		/deep/.el-dialog{
-			height: 75%;
-		}
-		/deep/.el-dialog__body{
-			padding: 0 0 10px 0;
-			height: 100%;
-		}
+
+	/deep/ .el-upload {
+		width: 100%;
 	}
-	.tc-middle {
-		// .arrr{
-		// 	border: 1px solid #0000003d;
-		// 	border-top: none;
-		// }
-		/deep/.el-collapse{
-			border-top: none;
-		}
-		/deep/.el-collapse-item__header {
-			color: #707070;
-			// border-bottom: 1px solid #e4e7ed;
-			border-top: 1px solid #0000003d;
-			font-size: 16px;
-			padding: 0 10px;
-			background-color: #eaeaea;
-		}
+}
 
-		/deep/.is-active {
-			background-color: #dadada;
-			color: #439dc1;
-		}
+.Print {
+	/deep/.el-dialog {
+		height: 75%;
+	}
 
-		/deep/.el-collapse-item__header:hover {
-			background-color: #dadada;
-			color: #439dc1;
-		}
+	/deep/.el-dialog__body {
+		padding: 0 0 10px 0;
+		height: 100%;
+	}
+}
 
-		/deep/.el-collapse-item__wrap {
-			border: 1px solid #EBEEF5;
-		}
+.tc-middle {
 
-		.tc-middle-add {
-			display: flex;
-			justify-content: space-between;
+	// .arrr{
+	// 	border: 1px solid #0000003d;
+	// 	border-top: none;
+	// }
+	/deep/.el-collapse {
+		border-top: none;
+	}
 
-			.el-button {
-				height: 28px;
-				margin: 15px 0;
-			}
-		}
+	/deep/.el-collapse-item__header {
+		color: #707070;
+		// border-bottom: 1px solid #e4e7ed;
+		border-top: 1px solid #0000003d;
+		font-size: 16px;
+		padding: 0 10px;
+		background-color: #eaeaea;
 	}
-	.agreement{
-		width: 100%;
-		height: calc(100% - 60px);
+
+	/deep/.is-active {
+		background-color: #dadada;
+		color: #439dc1;
+	}
+
+	/deep/.el-collapse-item__header:hover {
+		background-color: #dadada;
+		color: #439dc1;
+	}
+
+	/deep/.el-collapse-item__wrap {
+		border: 1px solid #EBEEF5;
+	}
+
+	.tc-middle-add {
 		display: flex;
-		.agreement-lest{
-			width: 190px;
+		justify-content: space-between;
+
+		.el-button {
+			height: 28px;
+			margin: 15px 0;
+		}
+	}
+}
+
+.agreement {
+	width: 100%;
+	height: calc(100% - 60px);
+	display: flex;
+
+	.agreement-lest {
+		width: 190px;
+		height: 100%;
+
+		.PlanningLibrary-left {
 			height: 100%;
-			.PlanningLibrary-left{
-				height: 100%;
-				width: 190px;
-				min-width: 150px;
-				background: #fff;
-				// box-shadow: 6px 6px 8px 0px rgba(0,0,0,0.25);
-				border-right: 1px solid #dedede;
-				.PlanningLibrary-left-top{
-					  background-color: #E6E6E6;
-					  height: 40px;
-					  padding: 7px;
-					  box-sizing: border-box;
-					  .PlanningLibrary-left-top-right{
-					  	  display: flex;
-					  	  height: 26px;
-						  i{
-						  	  font-size: 24px;
-						  	  color: #167AA1;
-						  	  margin-right: 5px;
-						  	  line-height: 26px;
-						  }
-						  span{
-						  	  color: #167AA1;
-						  	  font-size: 16px;
-						  	  display: table-cell;
-						  	  vertical-align:middle;
-						  }
-					  }
+			width: 190px;
+			min-width: 150px;
+			background: #fff;
+			// box-shadow: 6px 6px 8px 0px rgba(0,0,0,0.25);
+			border-right: 1px solid #dedede;
+
+			.PlanningLibrary-left-top {
+				background-color: #E6E6E6;
+				height: 40px;
+				padding: 7px;
+				box-sizing: border-box;
+
+				.PlanningLibrary-left-top-right {
+					display: flex;
+					height: 26px;
+
+					i {
+						font-size: 24px;
+						color: #167AA1;
+						margin-right: 5px;
+						line-height: 26px;
+					}
+
+					span {
+						color: #167AA1;
+						font-size: 16px;
+						display: table-cell;
+						vertical-align: middle;
+					}
 				}
-				.PlanningLibrary-left-data{
-					box-sizing: border-box;
-					ul{
-						li{
-							cursor: pointer;
-							color: #6f6f6f;
-							font-size: 14px;
-							height: 36px;
-							line-height: 36px;
-							padding: 0 16px;
-							overflow: hidden;
-							display: -webkit-box !important;
-							-webkit-line-clamp: 1;
-							-webkit-box-orient: vertical;
-							
-							i{
-								color: #F7C800;
-								margin-right: 2px;
-							}
+			}
+
+			.PlanningLibrary-left-data {
+				box-sizing: border-box;
+
+				ul {
+					li {
+						cursor: pointer;
+						color: #6f6f6f;
+						font-size: 14px;
+						height: 36px;
+						line-height: 36px;
+						padding: 0 16px;
+						overflow: hidden;
+						display: -webkit-box !important;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+
+						i {
+							color: #F7C800;
+							margin-right: 2px;
 						}
 					}
 				}
-				//选中背景色
-				.Check{
-					  background-color: #167aa1;
-					  color: #fff !important;
-				}
 			}
-		}
-		.agreement-right{
-			width: calc(100% -190px);
-			height: 100%;
-			padding: 20px;
-			box-sizing: border-box;
-			overflow-y: auto;
+
+			//选中背景色
+			.Check {
+				background-color: #167aa1;
+				color: #fff !important;
+			}
 		}
 	}
-	.branch{
-		/deep/.el-transfer-panel .el-transfer-panel__header .el-checkbox .el-checkbox__inner{display: none;}
-		/deep/.el-button--primary{
-			background-color: #47A1C4;
-			border: 1px solid #47A1C4;
-		}
-		/deep/.is-disabled{
-			background-color: #47A1C498;
-			border: 1px solid #47A1C4;
-		}
-		/deep/.el-checkbox__input.is-checked .el-checkbox__inner{
-			background-color: #47a1c4;
-			border-color: #47a1c4;
-		}
-		/deep/.el-checkbox__label{
-			color: #47a1c4;
-		}
-		/deep/.el-checkbox__label:hover{
-			color: #47a1c4;
-		}
+
+	.agreement-right {
+		// width: calc(100% -190px) !important;
+		width: 100%;
+		height: 100%;
+		padding: 20px;
+		box-sizing: border-box;
+		overflow-y: auto;
+	}
+}
+
+.branch {
+	/deep/.el-transfer-panel .el-transfer-panel__header .el-checkbox .el-checkbox__inner {
+		display: none;
+	}
+
+	/deep/.el-button--primary {
+		background-color: #47A1C4;
+		border: 1px solid #47A1C4;
+	}
+
+	/deep/.is-disabled {
+		background-color: #47A1C498;
+		border: 1px solid #47A1C4;
 	}
-	.operation{
+
+	/deep/.el-checkbox__input.is-checked .el-checkbox__inner {
+		background-color: #47a1c4;
+		border-color: #47a1c4;
+	}
+
+	/deep/.el-checkbox__label {
+		color: #47a1c4;
+	}
+
+	/deep/.el-checkbox__label:hover {
+		color: #47a1c4;
+	}
+}
+
+.operation {
+	width: 100%;
+	height: 400px;
+
+	.branch {
 		width: 100%;
-		height: 400px;
-		.branch{
+		height: calc(100% - 40px);
+		overflow-y: auto;
+
+		.Upload-butom-ont {
 			width: 100%;
-			height: calc(100% - 40px);
-			overflow-y: auto;
-				.Upload-butom-ont{
+
+			.tc-middle-add {
+				h3 {
+					color: #439dc1;
+					margin: 15px 0;
+
+					&::before {
+						content: "*";
+						color: rgba(0, 0, 0, 0);
+						margin-right: 5px;
+					}
+				}
+
+				.apse {
+					&::before {
+						content: "*";
+						color: #f56c6c;
+						margin-right: 5px;
+					}
+				}
+			}
+
+			.tc-middle-name {
+				width: 100%;
+				flex-wrap: wrap;
+
+				ul {
 					width: 100%;
-					.tc-middle-add {
-						h3{
-							color: #439dc1;
-							margin: 15px 0;
-							&::before{
-								content: "*";
-								color: rgba(0, 0, 0, 0);
-								margin-right: 5px;
+					display: flex;
+					flex-wrap: wrap;
+
+					li {
+						width: 100px;
+						height: 110px;
+						cursor: pointer;
+						margin: 10px;
+						margin-bottom: 0;
+						position: relative;
+						border: 1px solid #dedede;
+						border-radius: 10px;
+						padding: 10px;
+						box-sizing: border-box;
+
+						&:hover {
+							i {
+								display: block;
 							}
 						}
-					.apse{
-						&::before{
-							content: "*";
-							color: #f56c6c;
-							margin-right: 5px;
+
+						i {
+							position: absolute;
+							top: -9px;
+							right: -9px;
+							color: #FF4500;
+							font-size: 25px;
+							display: none;
 						}
-					}
-					}
-					.tc-middle-name{
-						width: 100%;
-						flex-wrap: wrap;
-						ul{
+
+						img {
+							width: 55px;
+							margin: 0 auto;
+							display: block;
+						}
+
+						div {
+							width: 100%;
+							display: block;
+							text-align: center;
+							color: #5e5e5e;
+							margin: 2px;
+							margin-top: 8px;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							word-break: break-all;
+							font-size: 14px;
+							display: inline-block;
+							display: -webkit-box !important;
+							-webkit-line-clamp: 1;
+							-webkit-box-orient: vertical;
+
+							span {
+								display: initial;
+								white-space: break-spaces;
+							}
+						}
+
+						.add {
 							width: 100%;
-							display: flex;
-							flex-wrap: wrap;
-							li{
-								width: 100px;
-								height: 110px;
-								cursor: pointer;
-								margin: 10px;
-								margin-bottom: 0;
+							height: 100%;
+
+							.add-top {
+								margin: 0 auto;
+								width: 80%;
+								height: 60%;
+								border: 2px dotted #c6c6c6;
+								border-radius: 5px;
 								position: relative;
-								border: 1px solid #dedede;
-								border-radius: 10px;
-								padding: 10px;
-								box-sizing: border-box;
-								&:hover{
-									i{
-										display: block;
-									}
-								}
-								i{
+
+								span {
+									display: inline;
 									position: absolute;
-									top: -9px;
-									right: -9px;
-									color: #FF4500;
-									font-size: 25px;
-									display: none;
-								}
-								img{
-									width: 55px;
-									margin: 0 auto;
-									display: block;
-								}
-								div{
-									width: 100%;
-									display: block;
-									text-align: center;
-									color: #5e5e5e;
-									margin: 2px;
-									margin-top: 8px;
-									overflow: hidden;
-									text-overflow: ellipsis;
-									word-break: break-all;
-									font-size: 14px;
-									display: inline-block;
-									display: -webkit-box !important;
-									-webkit-line-clamp: 1;
-									-webkit-box-orient: vertical;
-									span {
-									  display: initial;
-									  white-space: break-spaces;
-									}
-								}
-								.add{
-									width: 100%;
-									height: 100%;
-									.add-top{
-										margin: 0 auto;
-										width: 80%;
-										height: 60%;
-										border: 2px dotted #c6c6c6;
-										border-radius: 5px;
-										position: relative;
-										span{
-											display: inline;
-											position: absolute;
-											top: calc(50% - 15px);
-											left:  calc(50% - 15px);
-											font-size: 30px;
-											color: #bbb;
-										}
-									}
-									.add-buttom{
-										color: #5e5e5e;
-									}
+									top: calc(50% - 15px);
+									left: calc(50% - 15px);
+									font-size: 30px;
+									color: #bbb;
 								}
 							}
+
+							.add-buttom {
+								color: #5e5e5e;
+							}
 						}
 					}
+				}
 			}
 		}
 	}
+}
 </style>

Some files were not shown because too many files changed in this diff