13404089107
2025-04-06 614e294fdd40e7f5681c194716c8990a64ebda3a
修改bug
5个文件已修改
486 ■■■■■ 已修改文件
src/views/placement-batch/addResettle.vue 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/placement-batch/applayPerson.vue 280 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/placement-batch/components/ApprovalDialog.vue 128 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/placement-batch/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/placement-batch/person.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/placement-batch/addResettle.vue
@@ -7,25 +7,30 @@
                    <el-row :gutter="20">
                        <el-col :span="8">
                            <el-form-item label="拆迁项目名称" prop="projectName">
                                <el-input :disabled="$route.query.type == 'detail'" style="width: 200px;" v-model="form.projectName" placeholder="请输入"
                                    clearable />
                                <el-input :disabled="$route.query.type == 'detail'" style="width: 200px;"
                                    v-model="form.projectName" placeholder="请输入" clearable />
                            </el-form-item>
                        </el-col>
                        <el-col :span="8">
                            <el-form-item label="镇(街道)" prop="street">
                                <el-input :disabled="$route.query.type == 'detail'" style="width: 200px;" v-model="form.street" placeholder="请输入"
                                    clearable />
                                <!-- <el-input :disabled="$route.query.type == 'detail'" style="width: 200px;"
                                    v-model="form.street" placeholder="请输入" clearable /> -->
                                <el-select v-model="form.street" :disabled="$route.query.type == 'detail'" style="width: 200px;" placeholder="请选择">
                                    <el-option v-for="item in streetOptions" :key="item.value" :label="item.dictLabel"
                                    :value="item.dictLabel"  />
                                </el-select>
                            </el-form-item>
                        </el-col>
                        <el-col :span="8">
                            <el-form-item label="所在村(社区)" prop="community">
                                <el-input :disabled="$route.query.type == 'detail'" style="width: 200px;" v-model="form.community" placeholder="请输入" clearable />
                                <el-input :disabled="$route.query.type == 'detail'" style="width: 200px;"
                                    v-model="form.community" placeholder="请输入" clearable />
                            </el-form-item>
                        </el-col>
                        <el-col :span="8">
                            <el-form-item label="户主姓名" prop="householdHead">
                                <el-input :disabled="$route.query.type == 'detail'" style="width: 200px;" v-model="form.householdHead" placeholder="请输入"
                                    clearable />
                                <el-input :disabled="$route.query.type == 'detail'" style="width: 200px;"
                                    v-model="form.householdHead" placeholder="请输入" clearable />
                            </el-form-item>
                        </el-col>
                    </el-row>
@@ -33,21 +38,22 @@
                    <el-row :gutter="20">
                        <el-col :span="8">
                            <el-form-item label="户主身份号" prop="idCard">
                                <el-input :disabled="$route.query.type == 'detail'" style="width: 200px;" v-model="form.idCard" placeholder="请输入" clearable />
                                <el-input :disabled="$route.query.type == 'detail'" style="width: 200px;"
                                    v-model="form.idCard" placeholder="请输入" clearable />
                            </el-form-item>
                        </el-col>
                        <el-col :span="8">
                            <el-form-item label="应安置人数" prop="resettledNum">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.resettledNum" :controls="false"
                                    controls-position="right" style="width: 200px;">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.resettledNum"
                                    :controls="false" controls-position="right" style="width: 200px;">
                                    <template slot="append">人</template>
                                </el-input>
                            </el-form-item>
                        </el-col>
                        <el-col :span="8">
                            <el-form-item label="所有家庭成员应安置面积" prop="resettledArea">
                                <el-input :disabled="$route.query.type == 'detail'" style="width: 200px;" v-model="form.resettledArea" :controls="false"
                                    >
                                <el-input :disabled="$route.query.type == 'detail'" style="width: 200px;"
                                    v-model="form.resettledArea" :controls="false">
                                    <template slot="append">㎡</template>
                                </el-input>
                            </el-form-item>
@@ -61,16 +67,16 @@
                    <el-row :gutter="20">
                        <el-col :span="12">
                            <el-form-item label="新建商品住房/商业用房/停车位" prop="priceNewAmount">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.priceNewAmount" :min="0" :controls="false"
                                    style="width: 200px;">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.priceNewAmount"
                                    :min="0" :controls="false" style="width: 200px;">
                                    <template slot="append">万元</template>
                                </el-input>
                            </el-form-item>
                        </el-col>
                        <el-col :span="12">
                            <el-form-item label="二手住房" prop="priceOldAmount">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.priceOldAmount" :min="0" :controls="false"
                                    style="width: 200px;">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.priceOldAmount"
                                    :min="0" :controls="false" style="width: 200px;">
                                    <template slot="append">万元</template>
                                </el-input>
                            </el-form-item>
@@ -84,24 +90,24 @@
                    <el-row :gutter="20">
                        <el-col :span="8">
                            <el-form-item label="补偿总金额" prop="compensationAmount">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.compensationAmount" :min="0" :controls="false"
                                    style="width: 200px;">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.compensationAmount"
                                    :min="0" :controls="false" style="width: 200px;">
                                    <template slot="append">万元</template>
                                </el-input>
                            </el-form-item>
                        </el-col>
                        <el-col :span="8">
                            <el-form-item label="25%首付款" prop="downPaymentAmount">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.downPaymentAmount" :min="0" :controls="false"
                                    style="width: 200px;">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.downPaymentAmount"
                                    :min="0" :controls="false" style="width: 200px;">
                                    <template slot="append">万元</template>
                                </el-input>
                            </el-form-item>
                        </el-col>
                        <el-col :span="8">
                            <el-form-item label="每季度需要支付款项" prop="quarterPayAmount">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.quarterPayAmount" :min="0" :controls="false"
                                    style="width: 200px;">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.quarterPayAmount"
                                    :min="0" :controls="false" style="width: 200px;">
                                    <template slot="append">万元</template>
                                </el-input>
                            </el-form-item>
@@ -111,8 +117,8 @@
                    <el-row :gutter="20">
                        <el-col :span="8">
                            <el-form-item label="过渡补贴" prop="subsidyAmount">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.subsidyAmount" :min="0" :controls="false"
                                    style="width: 200px;">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.subsidyAmount"
                                    :min="0" :controls="false" style="width: 200px;">
                                    <template slot="append">万元</template>
                                </el-input>
                            </el-form-item>
@@ -122,7 +128,8 @@
                    <el-row>
                        <el-col :span="16">
                            <el-form-item label="备注" prop="remark">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注信息" />
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.remark"
                                    type="textarea" :rows="3" placeholder="请输入备注信息" />
                            </el-form-item>
                        </el-col>
                    </el-row>
@@ -130,8 +137,10 @@
                <!-- 按钮区域 -->
                <div class="form-footer">
                    <el-button type="primary" v-if="$route.query.type != 'detail'" size="small" @click="submitForm">提交</el-button>
                    <el-button type="primary" v-if="$route.query.type == 'detail'" size="small" @click="$router.back()">返回</el-button>
                    <el-button type="primary" v-if="$route.query.type != 'detail'" size="small"
                        @click="submitForm">提交</el-button>
                    <el-button type="primary" v-if="$route.query.type == 'detail'" size="small"
                        @click="$router.back()">返回</el-button>
                </div>
            </el-form>
        </el-card>
@@ -139,7 +148,8 @@
</template>
<script>
import { addPlacementBatchMoney,getPlacementBatchMoneyDetail,updatePlacementBatchMoney  } from '@/api/placement-details'
import { addPlacementBatchMoney, getPlacementBatchMoneyDetail, updatePlacementBatchMoney } from '@/api/placement-details'
import { getDictData } from '@/api/placement'
export default {
    name: 'AddResettle',
    data() {
@@ -161,6 +171,7 @@
                subsidyAmount: 0, // 过渡补贴
                remark: '' // 备注
            },
            streetOptions: [],
            // 表单校验规则
            rules: {
                projectName: [
@@ -207,6 +218,9 @@
        }
    },
    mounted() {
        getDictData('street').then(response => {
            this.streetOptions = response.data
        })
        if (this.$route.query.moneyId) {
            getPlacementBatchMoneyDetail({ id: this.$route.query.moneyId }).then(res => {
                if (res.code === 200) {
@@ -224,7 +238,7 @@
                if (valid) {
                    // TODO: 调用接口提交数据
                    if (this.$route.query.moneyId) {
                        updatePlacementBatchMoney({ ...this.form, placementBatchId: this.$route.query.id,id: this.$route.query.moneyId }).then(res => {
                        updatePlacementBatchMoney({ ...this.form, placementBatchId: this.$route.query.id, id: this.$route.query.moneyId }).then(res => {
                            if (res.code === 200) {
                                this.$message.success('编辑成功')
                                this.$router.back()
src/views/placement-batch/applayPerson.vue
@@ -5,41 +5,51 @@
        <!-- 基本信息 -->
        <el-row :gutter="20">
          <el-col :span="6">
            <el-form-item label="镇(街道)" prop="street" >
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.street" placeholder="请输入" clearable style="width:180px;" />
            <el-form-item label="镇(街道)" prop="street">
              <el-select v-model="form.street" :disabled="$route.query.type === 'detail'" placeholder="请选择"
                style="width: 180px">
                <el-option v-for="item in streetOptions" :key="item.dictCode" :label="item.dictLabel"
                  :value="item.dictLabel" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="所在村(社区)" prop="community" >
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.community" placeholder="请输入" clearable style="width:180px;" />
            <el-form-item label="所在村(社区)" prop="community">
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.community" placeholder="请输入" clearable
                style="width:180px;" />
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="拆迁项目名称" prop="projectName" >
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.projectName" placeholder="请输入" clearable style="width:180px;" />
            <el-form-item label="拆迁项目名称" prop="projectName">
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.projectName" placeholder="请输入"
                clearable style="width:180px;" />
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="拆迁时间" prop="demolitionTime">
              <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.demolitionTime" type="date" placeholder="请选择拆迁时间" style="width:180px;" />
              <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.demolitionTime" type="date"
                placeholder="请选择拆迁时间" style="width:180px;" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="20">
          <el-col :span="6">
            <el-form-item label="户主姓名" prop="householdHead" >
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.householdHead" placeholder="请输入" clearable style="width:180px;" />
            <el-form-item label="户主姓名" prop="householdHead">
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.householdHead" placeholder="请输入"
                clearable style="width:180px;" />
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="户主身份号" prop="idCard" >
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.idCard" placeholder="请输入" clearable style="width:180px;" />
            <el-form-item label="户主身份号" prop="idCard">
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.idCard" placeholder="请输入" clearable
                style="width:180px;" />
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="联系电话" prop="mobile" >
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.mobile" placeholder="请输入" clearable style="width:180px;" />
            <el-form-item label="联系电话" prop="mobile">
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.mobile" placeholder="请输入" clearable
                style="width:180px;" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -48,18 +58,20 @@
        <div class="section-title">本次安置人数</div>
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="集体经济组织成员" prop="currentCollectiveNum" >
            <el-form-item label="集体经济组织成员" prop="currentCollectiveNum">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.currentCollectiveNum" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.currentCollectiveNum"
                  placeholder="请输入" clearable style="width: 250px;">
                  <template slot="append">人</template>
                </el-input>
              </div>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="非集体经济组织成员" prop="currentNoCollectiveNum" >
            <el-form-item label="非集体经济组织成员" prop="currentNoCollectiveNum">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.currentNoCollectiveNum" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.currentNoCollectiveNum"
                  placeholder="请输入" clearable style="width: 250px;">
                  <template slot="append">人</template>
                </el-input>
              </div>
@@ -68,7 +80,8 @@
          <el-col :span="8">
            <el-form-item label="合计" prop="currentCount">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.currentCount" placeholder="自动计算" disabled style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.currentCount" placeholder="自动计算"
                  disabled style="width: 250px;">
                  <template slot="append">人</template>
                </el-input>
              </div>
@@ -78,14 +91,16 @@
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="待安置家庭成员姓名" prop="waitFamilyNames" >
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.waitFamilyNames" placeholder="请输入" clearable style="width: 250px;" />
            <el-form-item label="待安置家庭成员姓名" prop="waitFamilyNames">
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.waitFamilyNames" placeholder="请输入"
                clearable style="width: 250px;" />
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="待安置人员应安置面积合计" label-width="215px" prop="waitFamilyArea" >
            <el-form-item label="待安置人员应安置面积合计" label-width="215px" prop="waitFamilyArea">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.waitFamilyArea" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.waitFamilyArea" placeholder="请输入"
                  clearable style="width: 250px;">
                  <template slot="append">㎡</template>
                </el-input>
              </div>
@@ -97,18 +112,22 @@
        <div class="section-title">补偿金额</div>
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="新建商品住房/商业用房/停车位" label-width="215px" prop="compensationNewAmount" >
            <el-form-item label="新建商品住房/商业用房/停车位" label-width="215px" prop="compensationNewAmount"
              :rules="[{ required: !form.compensationOldAmount, message: '请输入新建商品住房/商业用房/停车位', trigger: 'blur' }]">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.compensationNewAmount" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.compensationNewAmount"
                  placeholder="请输入" clearable style="width: 250px;">
                  <template slot="append">万元</template>
                </el-input>
              </div>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="二手住房" label-width="215px" prop="compensationOldAmount" >
            <el-form-item label="二手住房" label-width="215px" prop="compensationOldAmount"
              :rules="[{ required: !form.compensationNewAmount, message: '请输入二手住房', trigger: 'blur' }]">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.compensationOldAmount" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.compensationOldAmount"
                  placeholder="请输入" clearable style="width: 250px;">
                  <template slot="append">万元</template>
                </el-input>
              </div>
@@ -117,7 +136,8 @@
          <el-col :span="8">
            <el-form-item label="合计" label-width="215px" prop="compensationSum">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.compensationSum" placeholder="自动计算" disabled style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.compensationSum" placeholder="自动计算"
                  disabled style="width: 250px;">
                  <template slot="append">万元</template>
                </el-input>
              </div>
@@ -127,27 +147,30 @@
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="25%首付款" label-width="215px" prop="downPaymentAmount" >
            <el-form-item label="25%首付款" label-width="215px" prop="downPaymentAmount">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.downPaymentAmount" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.downPaymentAmount" placeholder="请输入"
                  clearable style="width: 250px;">
                  <template slot="append">万元</template>
                </el-input>
              </div>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="每季度需支付款项" label-width="215px" prop="quarterPayAmount" >
            <el-form-item label="每季度需支付款项" label-width="215px" prop="quarterPayAmount">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.quarterPayAmount" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.quarterPayAmount" placeholder="请输入"
                  clearable style="width: 250px;">
                  <template slot="append">万元</template>
                </el-input>
              </div>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="过渡补贴" label-width="215px" prop="subsidyAmount" >
            <el-form-item label="过渡补贴" label-width="215px" prop="subsidyAmount">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.subsidyAmount" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.subsidyAmount" placeholder="请输入"
                  clearable style="width: 250px;">
                  <template slot="append">万元</template>
                </el-input>
              </div>
@@ -158,7 +181,8 @@
        <el-row>
          <el-col :span="24">
            <el-form-item label="备注" label-width="215px" prop="remark">
              <el-input :disabled="$route.query.type === 'detail'" type="textarea" v-model="form.remark" placeholder="请输入备注信息" :rows="3" style="width: 100%;" />
              <el-input :disabled="$route.query.type === 'detail'" type="textarea" v-model="form.remark"
                placeholder="请输入备注信息" :rows="3" style="width: 100%;" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -166,9 +190,9 @@
        <!-- 凭证发放时间 -->
        <el-row>
          <el-col :span="8">
            <el-form-item label="凭证发放时间" label-width="215px" prop="certificateTime" >
              <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.certificateTime" type="date" placeholder="请选择凭证发放时间"
                style="width: 250px;" />
            <el-form-item label="凭证发放时间" label-width="215px" prop="certificateTime">
              <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.certificateTime" type="date"
                placeholder="请选择凭证发放时间" style="width: 250px;" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -177,14 +201,16 @@
        <div class="section-title">购房信息</div>
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="购房时间" prop="buyTime" >
              <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.buyTime" type="date" placeholder="请选择购房时间" style="width: 250px;" />
            <el-form-item label="购房时间" prop="buyTime">
              <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.buyTime" type="date"
                placeholder="请选择购房时间" style="width: 250px;" />
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="成交金额" prop="dealAmount" >
            <el-form-item label="成交金额" prop="dealAmount">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.dealAmount" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.dealAmount" placeholder="请输入"
                  clearable style="width: 250px;">
                  <template slot="append">万元</template>
                </el-input>
              </div>
@@ -194,23 +220,29 @@
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="新建商品住房: 楼盘名称" prop="newHousingName"  :rules="{ required: (form.newHousingName || form.newHousingArea || form.newHousingNum) , message: '请输入楼盘名称', trigger: 'blur' }" >
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.newHousingName" placeholder="请输入" clearable style="width: 250px;" />
            <el-form-item label="新建商品住房: 楼盘名称" prop="newHousingName"
              :rules="{ required: (form.newHousingName || form.newHousingArea || form.newHousingNum), message: '请输入楼盘名称', trigger: 'blur' }">
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.newHousingName" placeholder="请输入"
                clearable style="width: 250px;" />
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="面积" prop="newHousingArea" :rules="{ required:  (form.newHousingName || form.newHousingArea || form.newHousingNum), message: '请输入面积', trigger: 'blur' }" >
            <el-form-item label="面积" prop="newHousingArea"
              :rules="{ required: (form.newHousingName || form.newHousingArea || form.newHousingNum), message: '请输入面积', trigger: 'blur' }">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.newHousingArea" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.newHousingArea" placeholder="请输入"
                  clearable style="width: 250px;">
                  <template slot="append">㎡</template>
                </el-input>
              </div>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="套数" prop="newHousingNum"  :rules="{ required:  (form.newHousingName || form.newHousingArea || form.newHousingNum), message: '请输入套数', trigger: 'blur' }" >
            <el-form-item label="套数" prop="newHousingNum"
              :rules="{ required: (form.newHousingName || form.newHousingArea || form.newHousingNum), message: '请输入套数', trigger: 'blur' }">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.newHousingNum" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.newHousingNum" placeholder="请输入"
                  clearable style="width: 250px;">
                  <template slot="append">套</template>
                </el-input>
              </div>
@@ -220,23 +252,29 @@
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="二手住房: 小区名称" prop="oldHousingName" :rules="{ required: (form.oldHousingName || form.oldHousingArea || form.oldHousingNum) , message: '请输入小区名称', trigger: 'blur' }" >
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.oldHousingName" placeholder="请输入" clearable style="width: 250px;" />
            <el-form-item label="二手住房: 小区名称" prop="oldHousingName"
              :rules="{ required: (form.oldHousingName || form.oldHousingArea || form.oldHousingNum), message: '请输入小区名称', trigger: 'blur' }">
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.oldHousingName" placeholder="请输入"
                clearable style="width: 250px;" />
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="面积" prop="oldHousingArea" :rules="{ required:  (form.oldHousingName || form.oldHousingArea || form.oldHousingNum), message: '请输入面积', trigger: 'blur' }" >
            <el-form-item label="面积" prop="oldHousingArea"
              :rules="{ required: (form.oldHousingName || form.oldHousingArea || form.oldHousingNum), message: '请输入面积', trigger: 'blur' }">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.oldHousingArea" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.oldHousingArea" placeholder="请输入"
                  clearable style="width: 250px;">
                  <template slot="append">㎡</template>
                </el-input>
              </div>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="套数" prop="oldHousingNum" :rules="{ required:  (form.oldHousingName || form.oldHousingArea || form.oldHousingNum), message: '请输入套数', trigger: 'blur' }" >
            <el-form-item label="套数" prop="oldHousingNum"
              :rules="{ required: (form.oldHousingName || form.oldHousingArea || form.oldHousingNum), message: '请输入套数', trigger: 'blur' }">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.oldHousingNum" placeholder="请输入" clearable style="width: 160px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.oldHousingNum" placeholder="请输入"
                  clearable style="width: 160px;">
                  <template slot="append">套</template>
                </el-input>
              </div>
@@ -246,32 +284,40 @@
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="新建商业用房: 楼盘名称" prop="buildHousingName" :rules="{ required: (form.buildHousingName || form.buildHousingAmount || form.buildHousingArea || form.buildHousingNum) , message: '请输入楼盘名称', trigger: 'blur' }" >
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.buildHousingName" placeholder="请输入" clearable style="width: 250px;" />
            <el-form-item label="新建商业用房: 楼盘名称" prop="buildHousingName"
              :rules="{ required: (form.buildHousingName || form.buildHousingAmount || form.buildHousingArea || form.buildHousingNum), message: '请输入楼盘名称', trigger: 'blur' }">
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.buildHousingName" placeholder="请输入"
                clearable style="width: 250px;" />
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="金额" prop="buildHousingAmount" :rules="{ required:  (form.buildHousingName || form.buildHousingAmount || form.buildHousingArea || form.buildHousingNum), message: '请输入金额', trigger: 'blur' }" >
            <el-form-item label="金额" prop="buildHousingAmount"
              :rules="{ required: (form.buildHousingName || form.buildHousingAmount || form.buildHousingArea || form.buildHousingNum), message: '请输入金额', trigger: 'blur' }">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.buildHousingAmount" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.buildHousingAmount" placeholder="请输入"
                  clearable style="width: 250px;">
                  <template slot="append">万元</template>
                </el-input>
              </div>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="面积" prop="buildHousingArea" :rules="{ required:  (form.buildHousingName || form.buildHousingAmount || form.buildHousingArea || form.buildHousingNum), message: '请输入面积', trigger: 'blur' }" >
            <el-form-item label="面积" prop="buildHousingArea"
              :rules="{ required: (form.buildHousingName || form.buildHousingAmount || form.buildHousingArea || form.buildHousingNum), message: '请输入面积', trigger: 'blur' }">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.buildHousingArea" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.buildHousingArea" placeholder="请输入"
                  clearable style="width: 250px;">
                  <template slot="append">㎡</template>
                </el-input>
              </div>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="套数" prop="buildHousingNum" :rules="{ required:  (form.buildHousingName || form.buildHousingAmount || form.buildHousingArea || form.buildHousingNum), message: '请输入套数', trigger: 'blur' }" >
            <el-form-item label="套数" prop="buildHousingNum"
              :rules="{ required: (form.buildHousingName || form.buildHousingAmount || form.buildHousingArea || form.buildHousingNum), message: '请输入套数', trigger: 'blur' }">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.buildHousingNum" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.buildHousingNum" placeholder="请输入"
                  clearable style="width: 250px;">
                  <template slot="append">套</template>
                </el-input>
              </div>
@@ -281,23 +327,29 @@
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="新建停车位: 楼盘名称" prop="newStopName" :rules="{ required: (form.newStopName || form.newStopArea || form.newStopNum) , message: '请输入楼盘名称', trigger: 'blur' }" >
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.newStopName" placeholder="请输入" clearable style="width: 250px;" />
            <el-form-item label="新建停车位: 楼盘名称" prop="newStopName"
              :rules="{ required: (form.newStopName || form.newStopArea || form.newStopNum), message: '请输入楼盘名称', trigger: 'blur' }">
              <el-input :disabled="$route.query.type === 'detail'" v-model="form.newStopName" placeholder="请输入"
                clearable style="width: 250px;" />
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="金额" prop="newStopArea" :rules="{ required:  (form.newStopName || form.newStopArea || form.newStopNum), message: '请输入金额', trigger: 'blur' }" >
            <el-form-item label="金额" prop="newStopArea"
              :rules="{ required: (form.newStopName || form.newStopArea || form.newStopNum), message: '请输入金额', trigger: 'blur' }">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.newStopArea" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.newStopArea" placeholder="请输入"
                  clearable style="width: 250px;">
                  <template slot="append">万元</template>
                </el-input>
              </div>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="个数" prop="newStopNum"  :rules="{ required:  (form.newStopName || form.newStopArea || form.newStopNum), message: '请输入个数', trigger: 'blur' }" >
            <el-form-item label="个数" prop="newStopNum"
              :rules="{ required: (form.newStopName || form.newStopArea || form.newStopNum), message: '请输入个数', trigger: 'blur' }">
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.newStopNum" placeholder="请输入" clearable style="width: 250px;">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.newStopNum" placeholder="请输入"
                  clearable style="width: 250px;">
                  <template slot="append">套</template>
                </el-input>
              </div>
@@ -309,41 +361,59 @@
        <div class="section-title">补偿款支付</div>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="自主购房协议签订时间" prop="signTime" >
              <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.signTime" type="date" placeholder="请选择时间" style="width: 250px;" />
            <el-form-item label="自主购房协议签订时间" prop="signTime">
              <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.signTime" type="date"
                placeholder="请选择时间" style="width: 250px;" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="25%补偿款及过渡补贴支付时间" label-width="220px" prop="compensationPayTime" >
              <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.compensationPayTime" type="date" placeholder="请选择时间"
                style="width: 250px;" />
            <el-form-item label="25%补偿款及过渡补贴支付时间" label-width="220px" prop="compensationPayTime">
              <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.compensationPayTime" type="date"
                placeholder="请选择时间" style="width: 250px;" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="20">
          <el-col :span="24">
            <el-form-item label="剩余款项支付时间:" prop="remainingTime1">
            <el-form-item label="剩余款项支付时间:">
              <el-row :gutter="20">
                <el-col :span="4">
                  <div class="payment-label">第一年</div>
                  <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.remainingTime1" type="date" placeholder="请选择时间" style="width: 200px;" />
                  <el-form-item prop="remainingTime1">
                    <el-date-picker :disabled="$route.query.type === 'detail'" :value-format="'yyyy-MM-dd'"
                      v-model="form.remainingTime1" type="date" placeholder="请选择时间" style="width: 200px;" />
                  </el-form-item>
                </el-col>
                <el-col :span="4">
                  <div class="payment-label">第二年</div>
                  <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.remainingTime2" type="date" placeholder="请选择时间" style="width: 200px;" />
                  <el-form-item prop="remainingTime2">
                    <el-date-picker :disabled="$route.query.type === 'detail'" :value-format="'yyyy-MM-dd'"
                      v-model="form.remainingTime2" type="date" placeholder="请选择时间" style="width: 200px;" />
                  </el-form-item>
                </el-col>
                <el-col :span="4">
                  <div class="payment-label">第三年</div>
                  <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.remainingTime3" type="date" placeholder="请选择时间" style="width: 200px;" />
                  <el-form-item prop="remainingTime3">
                    <el-date-picker :disabled="$route.query.type === 'detail'" :value-format="'yyyy-MM-dd'"
                      v-model="form.remainingTime3" type="date" placeholder="请选择时间" style="width: 200px;" />
                  </el-form-item>
                </el-col>
                <el-col :span="4">
                  <div class="payment-label">第四年</div>
                  <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.remainingTime4" type="date" placeholder="请选择时间" style="width: 200px;" />
                  <el-form-item prop="remainingTime4">
                    <el-date-picker :disabled="$route.query.type === 'detail'" :value-format="'yyyy-MM-dd'"
                      v-model="form.remainingTime4" type="date" placeholder="请选择时间" style="width: 200px;" />
                  </el-form-item>
                </el-col>
                <el-col :span="4">
                  <div class="payment-label">第五年</div>
                  <el-date-picker :disabled="$route.query.type === 'detail'" v-model="form.remainingTime5" type="date" placeholder="请选择时间" style="width: 200px;" />
                  <el-form-item prop="remainingTime5">
                    <el-date-picker :disabled="$route.query.type === 'detail'" :value-format="'yyyy-MM-dd'"
                      v-model="form.remainingTime5" type="date" placeholder="请选择时间" style="width: 200px;" />
                  </el-form-item>
                </el-col>
              </el-row>
            </el-form-item>
@@ -362,6 +432,7 @@
<script>
import { addPlacementBatchHouse, updatePlacementBatchHouse, getPlacementBatchHouseDetail } from '@/api/placement-details'
import { getDictData } from '@/api/placement'
export default {
  name: 'ApplayPerson',
  data() {
@@ -410,6 +481,7 @@
        remainingTime4: '',
        remainingTime5: ''
      },
      streetOptions: [],
      rules: {
        street: [{ required: true, message: '请输入镇(街道)', trigger: 'blur' }],
        community: [{ required: true, message: '请输入所在村(社区)', trigger: 'blur' }],
@@ -437,14 +509,14 @@
          { required: true, message: '请输入待安置人员应安置面积合计', trigger: 'blur' },
          // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        ],
        compensationNewAmount: [
          { required: true, message: '请输入新建商品住房/商业用房/停车位金额', trigger: 'blur' },
          // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        ],
        compensationOldAmount: [
          { required: true, message: '请输入二手住房金额', trigger: 'blur' },
          // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        ],
        // compensationNewAmount: [
        //   { required: true, message: '请输入新建商品住房/商业用房/停车位金额', trigger: 'blur' },
        //   // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        // ],
        // compensationOldAmount: [
        //   { required: true, message: '请输入二手住房金额', trigger: 'blur' },
        //   // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        // ],
        downPaymentAmount: [
          { required: true, message: '请输入25%首付款', trigger: 'blur' },
          // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
@@ -492,12 +564,17 @@
      }
    }
  },
  mounted(){
    if(this.$route.query.houseId){
      getPlacementBatchHouseDetail({id:this.$route.query.houseId}).then(res => {
  mounted() {
    getDictData('street').then(response => {
      this.streetOptions = response.data
    })
    if (this.$route.query.houseId) {
      // 镇(街道)
      getPlacementBatchHouseDetail({ id: this.$route.query.houseId }).then(res => {
        this.form = res.data
      })
    }else{
    } else {
      this.resetForm()
    }
  },
@@ -552,24 +629,31 @@
    submitForm() {
      this.$refs.form.validate(valid => {
        if (valid) {
          if (!this.form.newHousingName && !this.form.oldHousingName && !this.form.buildHousingName && !this.form.newStopName) {
            this.$message.error('请至少填写一项')
            return
          }
          // console.log('////////////////////',this.form);
          // TODO: 调用接口提交数据
          if(this.$route.query.houseId){
          if (this.$route.query.houseId) {
            // 修改
            updatePlacementBatchHouse({...this.form,placementBatchId:this.$route.query.id,id:this.$route.query.houseId}).then(res => {
              if(res.code === 200){
            updatePlacementBatchHouse({ ...this.form, placementBatchId: this.$route.query.id, id: this.$route.query.houseId }).then(res => {
              if (res.code === 200) {
                this.$message.success('修改成功')
                this.$router.back()
              }else{
              } else {
                this.$message.error(res.message)
              }
            })
          }else{
          } else {
            // 新增
            addPlacementBatchHouse({...this.form,placementBatchId:this.$route.query.id}).then(res => {
              if(res.code === 200){
            addPlacementBatchHouse({ ...this.form, placementBatchId: this.$route.query.id }).then(res => {
              if (res.code === 200) {
                this.$message.success('提交成功')
                this.$router.back()
              }else{
              } else {
                this.$message.error(res.message)
              }
            })
src/views/placement-batch/components/ApprovalDialog.vue
@@ -15,11 +15,11 @@
          <!-- 表格区域 -->
          <el-table v-loading="loading" :data="tableData" border style="width: 100%" max-height="300px"
            :row-class-name="tableRowClassName">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="street" label="镇(街道)" min-width="120" align="center" />
            <el-table-column prop="projectName" label="拆迁项目名称" min-width="180" align="center" />
            <el-table-column prop="community" label="所在村(社区)" min-width="120" align="center" />
            <el-table-column prop="householdHead" label="户主姓名" min-width="100" align="center">
            <el-table-column type="index" label="序号" key="table_A" width="50" align="center" />
            <el-table-column prop="street" label="镇(街道)" key="table_A" min-width="120" align="center" />
            <el-table-column prop="projectName" label="拆迁项目名称" key="table_A" min-width="180" align="center" />
            <el-table-column prop="community" label="所在村(社区)" key="table_A" min-width="120" align="center" />
            <el-table-column prop="householdHead" label="户主姓名" key="table_A" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.householdHead }}
                  <el-tooltip v-if="scope.row.householdHeadWarn == 1" class="item" effect="dark" content="用户信息未通过安置申请"
@@ -28,7 +28,7 @@
                      :src="require('../../../assets/logo/warning.png')" :fit="fit"></el-image> </el-tooltip></span>
              </template>
            </el-table-column>
            <el-table-column prop="idCard" label="身份证号" min-width="180" align="center">
            <el-table-column prop="idCard" label="身份证号"  key="table_A" min-width="180" align="center">
              <template slot-scope="scope">
                {{ scope.row.idCard || "-" }}
                <el-tooltip v-if="scope.row.idCardWarn == 1" class="item" effect="dark" content="身份信息不存在于待安置人员库"
@@ -38,8 +38,8 @@
                </el-tooltip>
              </template>
            </el-table-column>
            <el-table-column prop="resettledNum" label="应安置人数(人)" min-width="140" align="center" />
            <el-table-column label="所有家庭人员应安置面积(㎡)" prop="resettledArea" min-width="160" align="center">
            <el-table-column prop="resettledNum"  key="table_A" label="应安置人数(人)" min-width="140" align="center" />
            <el-table-column label="所有家庭人员应安置面积(㎡)" key="table_A" prop="resettledArea" min-width="160" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.resettledArea }}
                  <el-tooltip v-if="scope.row.waitFamilyAreaWarn == 1" class="item" effect="dark" content="应补偿面积数据异常"
@@ -48,8 +48,8 @@
                      :src="require('../../../assets/logo/warning.png')" :fit="fit"></el-image> </el-tooltip></span>
              </template>
            </el-table-column>
            <el-table-column label="补偿单位标准(万元)" min-width="160" align="center">
              <el-table-column prop="priceNewAmount" label="新建商品住房、商业用房、停车位" min-width="160" align="center">
            <el-table-column label="补偿单位标准(万元)" key="table_A" min-width="160" align="center">
              <el-table-column prop="priceNewAmount" key="table_A" label="新建商品住房、商业用房、停车位" min-width="160" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.priceNewAmount }}
                    <el-tooltip v-if="scope.row.priceAmountWarn == 1" class="item" effect="dark" content="补充标准数据异常"
@@ -58,7 +58,7 @@
                        :src="require('../../../assets/logo/warning.png')" :fit="fit"></el-image> </el-tooltip></span>
                </template>
              </el-table-column>
              <el-table-column prop="priceOldAmount" label="二手住房" min-width="150" align="center">
              <el-table-column prop="priceOldAmount" key="table_A" label="二手住房" min-width="150" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.priceOldAmount }}
                    <el-tooltip v-if="scope.row.twoPriceWarn == 1" class="item" effect="dark" content="检测到多个购房情况请人工核对"
@@ -68,7 +68,7 @@
                </template>
              </el-table-column>
            </el-table-column>
            <el-table-column prop="compensationAmount" label="补偿资金总额(万元)" min-width="160" align="center">
            <el-table-column prop="compensationAmount" key="table_A" label="补偿资金总额(万元)" min-width="160" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.compensationAmount }}
                  <el-tooltip v-if="scope.row.compensationSumWarn == 1" class="item" effect="dark" content="补偿总金额数据异常"
@@ -77,8 +77,8 @@
                      :src="require('../../../assets/logo/warning.png')" :fit="fit"></el-image> </el-tooltip></span>
              </template>
            </el-table-column>
            <el-table-column prop="downPaymentAmount" label="25%首付款(㎡)" min-width="150" align="center" />
            <el-table-column prop="quarterPayAmount" v-if="activeTab == '1'" label="每季度需支付款项(万元)" min-width="180"
            <el-table-column prop="downPaymentAmount" key="table_A" label="25%首付款(㎡)" min-width="150" align="center" />
            <el-table-column prop="quarterPayAmount" key="table_A" v-if="activeTab == '1'" label="每季度需支付款项(万元)" min-width="180"
              align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.quarterPayAmount }}
@@ -88,7 +88,7 @@
                      :src="require('../../../assets/logo/warning.png')" :fit="fit"></el-image> </el-tooltip></span>
              </template>
            </el-table-column>
            <el-table-column prop="subsidyAmount" label="过渡补贴(万元)" min-width="180" align="center">
            <el-table-column prop="subsidyAmount" key="table_A" label="过渡补贴(万元)" min-width="180" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.subsidyAmount }}
                  <el-tooltip v-if="scope.row.subsidyAmount == 1" class="item" effect="dark" content="过渡补贴金额数据异常"
@@ -103,28 +103,28 @@
          <!-- 购房信息表格 -->
          <el-table v-loading="loading" :data="tableData" border style="width: 100%" max-height="300px"
            :row-class-name="tableRowClassName1">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="street" label="镇(街道)" min-width="100" align="center">
            <el-table-column type="index" key="table_B" label="序号" width="50" align="center" />
            <el-table-column prop="street" key="table_B" label="镇(街道)" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.street }}</span>
              </template>
            </el-table-column>
            <el-table-column prop="projectName" label="拆迁项目名称" min-width="100" align="center">
            <el-table-column prop="projectName" key="table_B" label="拆迁项目名称" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.projectName }}</span>
              </template>
            </el-table-column>
            <el-table-column prop="community" label="所在村(社区)" min-width="100" align="center">
            <el-table-column key="table_B" prop="community" label="所在村(社区)" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.community }}</span>
              </template>
            </el-table-column>
            <el-table-column prop="demolitionTime" label="拆迁时间" min-width="100" align="center">
            <el-table-column key="table_B" prop="demolitionTime" label="拆迁时间" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.demolitionTime }}</span>
              </template>
            </el-table-column>
            <el-table-column prop="householdHead" label="户主姓名" min-width="100" align="center">
            <el-table-column key="table_B" prop="householdHead" label="户主姓名" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.householdHead }} <el-tooltip v-if="scope.row.householdHeadWarn == 1" class="item"
                    effect="dark" content="户主信息不存在于待安置人员库" placement="top">
@@ -133,7 +133,7 @@
                  </el-tooltip></span>
              </template>
            </el-table-column>
            <el-table-column prop="idCard" label="身份证号" min-width="180" align="center">
            <el-table-column key="table_B" prop="idCard" label="身份证号" min-width="180" align="center">
              <template slot-scope="scope">
                {{ scope.row.idCard || '-' }} <el-tooltip v-if="scope.row.idCardWarn == 1" class="item" effect="dark"
                  content="身份信息不存在于待安置人员库" placement="top">
@@ -142,30 +142,30 @@
                </el-tooltip>
              </template>
            </el-table-column>
            <el-table-column prop="mobile" label="联系电话" min-width="100" align="center">
            <el-table-column key="table_B" prop="mobile" label="联系电话" min-width="100" align="center">
              <template slot-scope="scope">
                {{ scope.row.mobile || '-' }}
              </template>
            </el-table-column>
            <el-table-column label="本次安置人数(人)" min-width="100" align="center">
              <el-table-column prop="currentCollectiveNum" label="集体经济组织成员" min-width="100" align="center">
            <el-table-column key="table_B" label="本次安置人数(人)" min-width="100" align="center">
              <el-table-column key="table_B" prop="currentCollectiveNum" label="集体经济组织成员" min-width="100" align="center">
                <template slot-scope="scope">
                  {{ scope.row.currentCollectiveNum || '-' }}
                </template>
              </el-table-column>
              <el-table-column prop="currentNoCollectiveNum" label="非集体经济组织成员" min-width="100" align="center">
              <el-table-column key="table_B" prop="currentNoCollectiveNum" label="非集体经济组织成员" min-width="100" align="center">
                <template slot-scope="scope">
                  {{ scope.row.currentNoCollectiveNum || '-' }}
                </template>
              </el-table-column>
              <el-table-column prop="currentCount" label="合计" min-width="100" align="center">
              <el-table-column key="table_B" prop="currentCount" label="合计" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.currentCount }}</span>
                </template>
              </el-table-column>
            </el-table-column>
            <el-table-column prop="waitFamilyNames" label="待安置家庭成员姓名" min-width="100" align="center">
            <el-table-column key="table_B" prop="waitFamilyNames" label="待安置家庭成员姓名" min-width="100" align="center">
              <template slot-scope="scope">
                {{ scope.row.waitFamilyNames || '-' }} <el-tooltip v-if="scope.row.waitFamilyNamesWarn == 1"
                  class="item" effect="dark" content="身份信息存在重复数据" placement="top">
@@ -174,7 +174,7 @@
                </el-tooltip>
              </template>
            </el-table-column>
            <el-table-column prop="waitFamilyArea" label="待安置人员应安置面积合计(㎡)" min-width="100" align="center">
            <el-table-column key="table_B" prop="waitFamilyArea" label="待安置人员应安置面积合计(㎡)" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.waitFamilyArea }} <el-tooltip v-if="scope.row.waitFamilyAreaWarn == 1" class="item"
                    effect="dark" content="应补偿面积数据异常" placement="top">
@@ -183,8 +183,8 @@
                  </el-tooltip></span>
              </template>
            </el-table-column>
            <el-table-column label="补偿金额(万元)" min-width="100" align="center">
              <el-table-column prop="compensationNewAmount" label="新建商品住房、商业用房、停车位" min-width="100" align="center">
            <el-table-column key="table_B" label="补偿金额(万元)" min-width="100" align="center">
              <el-table-column key="table_B" prop="compensationNewAmount" label="新建商品住房、商业用房、停车位" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.compensationNewAmount }} <el-tooltip v-if="scope.row.compensationAmountWarn == 1"
                      class="item" effect="dark" content="检测到多个购房情况请人工核对" placement="top">
@@ -193,12 +193,12 @@
                    </el-tooltip></span>
                </template>
              </el-table-column>
              <el-table-column prop="compensationOldAmount" label="二手住房" min-width="100" align="center">
              <el-table-column key="table_B" prop="compensationOldAmount" label="二手住房" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.compensationOldAmount }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="compensationSum" label="合计" min-width="100" align="center">
              <el-table-column key="table_B" prop="compensationSum" label="合计" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.compensationSum }} <el-tooltip v-if="scope.row.compensationSumWarn == 1"
                      class="item" effect="dark" content="补偿总金额数据异常" placement="top">
@@ -208,12 +208,12 @@
                </template>
              </el-table-column>
            </el-table-column>
            <el-table-column prop="downPaymentAmount" label="25%首付款(万元)" min-width="100" align="center">
            <el-table-column key="table_B" prop="downPaymentAmount" label="25%首付款(万元)" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.downPaymentAmount }}</span>
              </template>
            </el-table-column>
            <el-table-column prop="quarterPayAmount" v-if="activeTab == '2'" label="每季度需支付款项(万元)"
            <el-table-column key="table_B" prop="quarterPayAmount" v-if="activeTab == '2'" label="每季度需支付款项(万元)"
              min-width="180" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.quarterPayAmount }} <el-tooltip v-if="scope.row.quarterPayAmountWarn == 1"
@@ -223,7 +223,7 @@
                  </el-tooltip></span>
              </template>
            </el-table-column>
            <el-table-column prop="subsidyAmount" label="过渡补贴(万元)" min-width="100" align="center">
            <el-table-column key="table_B" prop="subsidyAmount" label="过渡补贴(万元)" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.subsidyAmount }} <el-tooltip v-if="scope.row.subsidyAmount == 1" class="item"
                    effect="dark" content="过渡补贴金额数据异常" placement="top">
@@ -232,35 +232,35 @@
                  </el-tooltip></span>
              </template>
            </el-table-column>
            <el-table-column prop="remark" label="备注" min-width="100" align="center">
            <el-table-column key="table_B" prop="remark" label="备注" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.remark }}</span>
              </template>
            </el-table-column>
            <el-table-column prop="certificateTime" label="凭证发放时间" min-width="100" align="center">
            <el-table-column key="table_B" prop="certificateTime" label="凭证发放时间" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.certificateTime }}</span>
              </template>
            </el-table-column>
            <el-table-column prop="buyTime" label="购房时间" min-width="100" align="center">
            <el-table-column key="table_B" prop="buyTime" label="购房时间" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.buyTime }}</span>
              </template>
            </el-table-column>
            <el-table-column prop="dealAmount" label="成交金额(万元)" min-width="100" align="center">
            <el-table-column key="table_B" prop="dealAmount" label="成交金额(万元)" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.dealAmount }}</span>
              </template>
            </el-table-column>
            <el-table-column label="新建商品住房" min-width="100" align="center">
              <el-table-column prop="newHousingName" label="楼盘名称" min-width="100" align="center">
            <el-table-column key="table_B" label="新建商品住房" min-width="100" align="center">
              <el-table-column key="table_B" prop="newHousingName" label="楼盘名称" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.newHousingName }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="newHousingArea" label="面积(㎡)" min-width="100" align="center">
              <el-table-column key="table_B" prop="newHousingArea" label="面积(㎡)" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.newHousingArea }} <el-tooltip v-if="scope.row.areaWarn == 1" class="item"
                      effect="dark" content="面积数据异常" placement="top">
@@ -269,7 +269,7 @@
                    </el-tooltip></span>
                </template>
              </el-table-column>
              <el-table-column prop="newHousingNum" label="套数(套)" min-width="100" align="center">
              <el-table-column key="table_B" prop="newHousingNum" label="套数(套)" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.newHousingNum }}</span>
                </template>
@@ -277,18 +277,18 @@
            </el-table-column>
            <el-table-column label="二手住房" min-width="100" align="center">
              <el-table-column prop="oldHousingName" label="小区名称" min-width="100" align="center">
            <el-table-column key="table_B" label="二手住房" min-width="100" align="center">
              <el-table-column key="table_B" prop="oldHousingName" label="小区名称" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.oldHousingName }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="oldHousingArea" label="面积(㎡)" min-width="100" align="center">
              <el-table-column key="table_B" prop="oldHousingArea" label="面积(㎡)" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.oldHousingArea }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="oldHousingNum" label="套数(套)" min-width="100" align="center">
              <el-table-column key="table_B" prop="oldHousingNum" label="套数(套)" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.oldHousingNum }}</span>
                </template>
@@ -297,18 +297,18 @@
            <el-table-column prop="householdHead" label="新建商业用房" min-width="100" align="center">
              <el-table-column prop="buildHousingName" label="楼盘名称" min-width="100" align="center">
            <el-table-column key="table_B" prop="householdHead" label="新建商业用房" min-width="100" align="center">
              <el-table-column key="table_B" prop="buildHousingName" label="楼盘名称" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.buildHousingName }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="buildHousingArea" label="面积(㎡)" min-width="100" align="center">
              <el-table-column key="table_B" prop="buildHousingArea" label="面积(㎡)" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.buildHousingArea }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="buildHousingNum" label="套数(套)" min-width="100" align="center">
              <el-table-column key="table_B" prop="buildHousingNum" label="套数(套)" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.buildHousingNum }}</span>
                </template>
@@ -317,18 +317,18 @@
            <el-table-column label="新建停车位" min-width="100" align="center">
              <el-table-column prop="newStopName" label="楼盘名称" min-width="100" align="center">
            <el-table-column key="table_B" label="新建停车位" min-width="100" align="center">
              <el-table-column key="table_B" prop="newStopName" label="楼盘名称" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.newStopName }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="newStopArea" label="金额(万元)" min-width="100" align="center">
              <el-table-column key="table_B" prop="newStopArea" label="金额(万元)" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.newStopArea }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="newStopNum" label="个数(个)" min-width="100" align="center">
              <el-table-column key="table_B" prop="newStopNum" label="个数(个)" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.newStopNum }}</span>
                </template>
@@ -336,38 +336,38 @@
            </el-table-column>
            <el-table-column prop="signTime" label="自主购房协议签订时间" min-width="100" align="center">
            <el-table-column key="table_B" prop="signTime" label="自主购房协议签订时间" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.signTime }}</span>
              </template>
            </el-table-column>
            <el-table-column prop="compensationPayTime" label="25%补偿款及过渡补贴支付时间" min-width="100" align="center">
            <el-table-column key="table_B" prop="compensationPayTime" label="25%补偿款及过渡补贴支付时间" min-width="100" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.compensationPayTime }}</span>
              </template>
            </el-table-column>
            <el-table-column label="剩余款项支付时间" min-width="100" align="center">
              <el-table-column prop="remainingTime1" label="第一年" min-width="100" align="center">
            <el-table-column key="table_B" label="剩余款项支付时间" min-width="100" align="center">
              <el-table-column key="table_B" prop="remainingTime1" label="第一年" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.remainingTime1 }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="remainingTime2" label="第二年" min-width="100" align="center">
              <el-table-column key="table_B" prop="remainingTime2" label="第二年" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.remainingTime2 }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="remainingTime3" label="第三年" min-width="100" align="center">
              <el-table-column key="table_B" prop="remainingTime3" label="第三年" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.remainingTime3 }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="remainingTime4" label="第四年" min-width="100" align="center">
              <el-table-column key="table_B" prop="remainingTime4" label="第四年" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.remainingTime4 }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="remainingTime5" label="第四年" min-width="100" align="center">
              <el-table-column key="table_B" prop="remainingTime5" label="第四年" min-width="100" align="center">
                <template slot-scope="scope">
                  <span>{{ scope.row.remainingTime5 }}</span>
                </template>
src/views/placement-batch/index.vue
@@ -37,9 +37,9 @@
      <el-table-column prop="downPaymentAmount" label="25%首付款(万元)" align="center" />
      <el-table-column prop="quarterPayAmount" label="每季度需支付款项(万元)" align="center" />
      <el-table-column prop="subsidyAmount" label="过渡补贴(万元)" align="center" />
      <el-table-column prop="businessArea" label="新建商品房(㎡)" align="center" />
      <el-table-column prop="newArea" label="新建商品房(㎡)" align="center" />
      <el-table-column prop="oldArea" label="二手住房(㎡)" align="center" />
      <el-table-column prop="newArea" label="新建商业用房(㎡)" align="center" />
      <el-table-column prop="businessArea" label="新建商业用房(㎡)" align="center" />
      <el-table-column prop="parkingArea" label="新建停车位(个)" align="center" />
      <el-table-column prop="status" label="状态" align="center">
        <template slot-scope="scope">
src/views/placement-batch/person.vue
@@ -439,7 +439,7 @@
              <span>{{ scope.row.remainingTime4 }}</span>
            </template>
          </el-table-column>
          <el-table-column prop="remainingTime5" key="table_B" label="第四年" min-width="100" align="center">
          <el-table-column prop="remainingTime5" key="table_B" label="第五年" min-width="100" align="center">
            <template slot-scope="scope">
              <span>{{ scope.row.remainingTime5 }}</span>
            </template>