fix

13404089107

2025-04-03 644aad632b70e827106e202814066882adbcf5e4

fix

 package.json

@@ -40,6 +40,7 @@
    "axios": "0.28.1",
    "clipboard": "2.0.8",
    "core-js": "3.37.1",
    "dayjs": "^1.11.13",
    "echarts": "5.4.0",
    "element-ui": "2.15.14",
    "file-saver": "2.0.5",

 src/views/placement-batch/addResettle.vue

@@ -83,8 +83,8 @@
                    <div class="section-title">补偿金额</div>
                    <el-row :gutter="20">
                        <el-col :span="8">
                            <el-form-item label="补偿总金额" prop="compensationSumWarn">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.compensationSumWarn" :min="0" :controls="false" 
                            <el-form-item label="补偿总金额" prop="compensationAmount">
                                <el-input :disabled="$route.query.type == 'detail'" v-model="form.compensationAmount" :min="0" :controls="false" 
                                    style="width: 200px;">
                                    <template slot="append">万元</template>
                                </el-input>
@@ -155,7 +155,7 @@
                resettledArea: 0, // 所有家庭成员应安置面积
                priceNewAmount: 0, // 新建商品住房/商业用房/停车位
                priceOldAmount: 0, // 二手住房
                compensationSumWarn: 0, // 补偿总金额
                compensationAmount: 0, // 补偿总金额
                downPaymentAmount: 0, // 25%首付款
                quarterPayAmount: 0, // 每季度需要支付款项
                subsidyAmount: 0, // 过渡补贴

 src/views/placement-batch/applayPerson.vue

@@ -5,17 +5,17 @@
        <!-- 基本信息 -->
        <el-row :gutter="20">
          <el-col :span="6">
            <el-form-item label="镇（街道）" prop="street" required>
            <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>
          </el-col>
          <el-col :span="6">
            <el-form-item label="所在村（社区）" prop="community" required>
            <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" required>
            <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>
@@ -28,17 +28,17 @@

        <el-row :gutter="20">
          <el-col :span="6">
            <el-form-item label="户主姓名" prop="householdHead" required>
            <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" required>
            <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" required>
            <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>
@@ -48,7 +48,7 @@
        <div class="section-title">本次安置人数</div>
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="集体经济组织成员" prop="currentCollectiveNum" required>
            <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;">
                  <template slot="append">人</template>
@@ -57,7 +57,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="非集体经济组织成员" prop="currentNoCollectiveNum" required>
            <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;">
                  <template slot="append">人</template>
@@ -78,12 +78,12 @@

        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="待安置家庭成员姓名" prop="waitFamilyNames" required>
            <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" required>
            <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;">
                  <template slot="append">㎡</template>
@@ -97,7 +97,7 @@
        <div class="section-title">补偿金额</div>
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="新建商品住房/商业用房/停车位" label-width="215px" prop="compensationNewAmount" required>
            <el-form-item label="新建商品住房/商业用房/停车位" label-width="215px" prop="compensationNewAmount" >
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.compensationNewAmount" placeholder="请输入" clearable style="width: 250px;">
                  <template slot="append">万元</template>
@@ -106,7 +106,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="二手住房" label-width="215px" prop="compensationOldAmount" required>
            <el-form-item label="二手住房" label-width="215px" prop="compensationOldAmount" >
              <div class="input-with-unit">
                <el-input :disabled="$route.query.type === 'detail'" v-model="form.compensationOldAmount" placeholder="请输入" clearable style="width: 250px;">
                  <template slot="append">万元</template>
@@ -127,7 +127,7 @@

        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="25%首付款" label-width="215px" prop="downPaymentAmount" required>
            <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;">
                  <template slot="append">万元</template>
@@ -136,7 +136,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="每季度需支付款项" label-width="215px" prop="quarterPayAmount" required>
            <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;">
                  <template slot="append">万元</template>
@@ -145,7 +145,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="过渡补贴" label-width="215px" prop="subsidyAmount" required>
            <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;">
                  <template slot="append">万元</template>
@@ -166,7 +166,7 @@
        <!-- 凭证发放时间 -->
        <el-row>
          <el-col :span="8">
            <el-form-item label="凭证发放时间" label-width="215px" prop="certificateTime" required>
            <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>
@@ -177,12 +177,12 @@
        <div class="section-title">购房信息</div>
        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="购房时间" prop="buyTime" required>
            <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" required>
            <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;">
                  <template slot="append">万元</template>
@@ -194,12 +194,12 @@

        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="新建商品住房: 楼盘名称" prop="newHousingName" required>
            <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" required>
            <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;">
                  <template slot="append">㎡</template>
@@ -208,7 +208,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="套数" prop="newHousingNum" required>
            <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;">
                  <template slot="append">套</template>
@@ -220,12 +220,12 @@

        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="二手住房: 小区名称" prop="oldHousingName" required>
            <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" required>
            <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;">
                  <template slot="append">㎡</template>
@@ -234,7 +234,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="套数" prop="oldHousingNum" required>
            <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;">
                  <template slot="append">套</template>
@@ -246,12 +246,12 @@

        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="新建商业用房: 楼盘名称" prop="buildHousingName" required>
            <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" required>
            <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;">
                  <template slot="append">万元</template>
@@ -260,7 +260,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="面积" prop="buildHousingArea" required>
            <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;">
                  <template slot="append">㎡</template>
@@ -269,7 +269,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="套数" prop="buildHousingNum" required>
            <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;">
                  <template slot="append">套</template>
@@ -281,12 +281,12 @@

        <el-row :gutter="20">
          <el-col :span="8">
            <el-form-item label="新建停车位: 楼盘名称" prop="newStopName" required>
            <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" required>
            <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;">
                  <template slot="append">万元</template>
@@ -295,7 +295,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="个数" prop="newStopNum" required>
            <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;">
                  <template slot="append">套</template>
@@ -309,12 +309,12 @@
        <div class="section-title">补偿款支付</div>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="自主购房协议签订时间" prop="signTime" required>
            <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" required>
            <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>
@@ -461,46 +461,6 @@
        buyTime: [{ required: true, message: '请选择购房时间', trigger: 'change' }],
        dealAmount: [
          { required: true, message: '请输入成交金额', trigger: 'blur' },
          // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        ],
        newHousingName: [{ required: true, message: '请输入新建商品住房楼盘名称', trigger: 'blur' }],
        newHousingArea: [
          { required: true, message: '请输入新建商品住房面积', trigger: 'blur' },
          // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        ],
        newHousingNum: [
          { required: true, message: '请输入新建商品住房套数', trigger: 'blur' },
          // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        ],
        oldHousingName: [{ required: true, message: '请输入二手住房小区名称', trigger: 'blur' }],
        oldHousingArea: [
          { required: true, message: '请输入二手住房面积', trigger: 'blur' },
          // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        ],
        oldHousingNum: [
          { required: true, message: '请输入二手住房套数', trigger: 'blur' },
          // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        ],
        buildHousingName: [{ required: true, message: '请输入新建商业用房楼盘名称', trigger: 'blur' }],
        buildHousingAmount: [
          { required: true, message: '请输入新建商业用房金额', trigger: 'blur' },
          // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        ],
        buildHousingArea: [
          { required: true, message: '请输入新建商业用房面积', trigger: 'blur' },
          // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        ],
        buildHousingNum: [
          { required: true, message: '请输入新建商业用房套数', trigger: 'blur' },
          // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        ],
        newStopName: [{ required: true, message: '请输入新建停车位楼盘名称', trigger: 'blur' }],
        newStopArea: [
          { required: true, message: '请输入新建停车位金额', trigger: 'blur' },
          // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        ],
        newStopNum: [
          { required: true, message: '请输入新建停车位个数', trigger: 'blur' },
          // { type: 'number', message: '请输入正确的数字', trigger: 'blur' }
        ],
        signTime: [{ required: true, message: '请选择自主购房协议签订时间', trigger: 'change' }],

 src/views/placement-batch/components/ApprovalDialog.vue

@@ -326,7 +326,7 @@
                  <div class="approval-time-info">
                    <div class="approval-time-title">审核时间：</div>
                    <div class="approval-time">
                      {{ detailData.approveTime || "-" }}
                      {{ detailData.approveTime | formatDate }}
                    </div>
                  </div>
                </div>
@@ -372,6 +372,7 @@
</template>

<script>
import dayjs from 'dayjs';
import { getPlacementBatchDetail } from "@/api/placement-details";
export default {
  name: "ApprovalDialog",
@@ -394,6 +395,15 @@
    placementBatchId: {
      type: Number,
      default: "",
    },
  },
  filters: {
    formatDate(date) {
      if (date) {
        return dayjs(date).format("YYYY-MM-DD HH:mm:ss");
      } else {
        return "-";
      }
    },
  },
  data() {
@@ -462,11 +472,18 @@
      this.getList();
    },
    tableRowClassName({ row, rowIndex }) {
      if (row.hasError) {
        return "error-row";
      if (row.compensationSumWarn == 1 || row.householdHeadWarn == 1 || row.idCardWarn == 1 || row.priceAmountWarn == 1 || row.quarterPayAmountWarn == 1 || row.subsidyAmountWarn == 1 || row.twoPriceWarn == 1 || row.waitFamilyAreaWarn == 1) {
        return 'warning-row'
      }
      return "";
      return ''
    },
    tableRowClassName1({ row, rowIndex }) {
      if (row.areaWarn == 1 || row.compensationAmountWarn == 1 || row.compensationSumWarn == 1 || row.householdHeadWarn == 1 || row.idCardWarn == 1 || row.waitFamilyAreaWarn == 1 || row.waitFamilyNamesWarn == 1 || row.subsidyAmountWarn == 1 || row.quarterPayAmountWarn == 1) {
        return 'warning-row'
      }
      return ''
    },

    cancelAudit() {
      this.$emit("close");
      this.resetForm();

 src/views/placement-batch/components/exportMoneyApplay.vue

@@ -66,6 +66,7 @@
</template>

<script>

export default {
  name: "ExportMoneyApplay",
  props: {
@@ -86,6 +87,7 @@
      default: "",
    },
  },

  data() {
    return {
      loading: false,
@@ -110,7 +112,6 @@
  },
  methods: {
    open() {
      console.log("333333333333333333", this.batchNumber);
      this.form.batchNumber = JSON.parse(JSON.stringify(this.batchNumber));
    },
    handlehouseholdFileChange(file, fileList) {
@@ -143,6 +144,8 @@
          this.loading = true;
          if (this.type == 2) {
            delete this.form.assetFile;
          }else if (this.type == 1) {
            delete this.form.householdFile; 
          }
          this.$emit("importPrice", this.form);
          setTimeout(() => {

 src/views/placement-batch/index.vue

@@ -53,7 +53,7 @@
          <el-button size="mini" v-permission="['placement-batch/detail']" v-if="scope.row.status != '0'" type="text" @click="handleView(scope.row)">详情</el-button>
          <el-button size="mini" v-permission="['placement-batch/view']" type="text" @click="handleViewDetail(scope.row)">查看</el-button>
          <el-button size="mini" v-permission="['placement-batch/approval']"  v-if="scope.row.status == '0'" type="text" @click="handleApproval(scope.row)">审核</el-button>
          <el-button size="mini" v-permission="['placement-batch/del']" v-if="scope.row.status == '1'" type="text" @click="handleDelete(scope.row)">删除</el-button>
          <el-button size="mini" v-permission="['placement-batch/del']" v-if="scope.row.status != '0'" type="text" @click="handleDelete(scope.row)">删除</el-button>
        </template>
      </el-table-column>
    </el-table>

 src/views/placement-batch/person.vue

@@ -483,8 +483,11 @@
    },
    importPrice(form) {
      let formData = new FormData()
      formData.append('assetFile', form.assetFile)
      formData.append('householdFile', form.householdFile)
      if(this.activeTab == 'fullReport'){
        formData.append('assetFile', form.assetFile)
      }else{
        formData.append('householdFile', form.householdFile)
      }
      formData.append('batchNumber', form.batchNumber)
      formData.append('id', this.$route.query.id)
      importPlacementBatch(formData).then(res => {