Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/chongzhouRes...

13404089107

2025-04-07 3912d4c58a94df470412a560b8d56f7390cdfac5

Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/chongzhouResettle

 src/views/applicationBatchList/components/ApprovalDialog.vue

@@ -90,18 +90,18 @@
              >
                <div slot="content">{{ "身份证不在安置库" }}</div>
                <el-image
                style="width: 12px; height: 12px;margin-left:5px"
                :src="require('../../../assets/logo/warning.png')"
                :fit="fit"
              ></el-image>
                  style="width: 12px; height: 12px; margin-left: 5px"
                  :src="require('../../../assets/logo/warning.png')"
                  :fit="fit"
                ></el-image>
              </el-tooltip>
              <el-tooltip v-if="scope.row.idCardNoWarn == 1" placement="top">
                <div slot="content">{{ "身份证重复" }}</div>
                <el-image
                style="width: 12px; height: 12px;margin-left:5px"
                :src="require('../../../assets/logo/warning.png')"
                :fit="fit"
              ></el-image>
                  style="width: 12px; height: 12px; margin-left: 5px"
                  :src="require('../../../assets/logo/warning.png')"
                  :fit="fit"
                ></el-image>
              </el-tooltip>
            </template>
          </el-table-column>
@@ -161,10 +161,10 @@
              >
                <div slot="content">{{ "身份信息存在重复数据" }}</div>
                <el-image
                style="width: 12px; height: 12px;margin-left:5px"
                :src="require('../../../assets/logo/warning.png')"
                :fit="fit"
              ></el-image>
                  style="width: 12px; height: 12px; margin-left: 5px"
                  :src="require('../../../assets/logo/warning.png')"
                  :fit="fit"
                ></el-image>
              </el-tooltip>
            </template>
          </el-table-column>
@@ -182,10 +182,10 @@
              >
                <div slot="content">{{ "应补偿面积数据异常" }}</div>
                <el-image
                style="width: 12px; height: 12px;margin-left:5px"
                :src="require('../../../assets/logo/warning.png')"
                :fit="fit"
              ></el-image>
                  style="width: 12px; height: 12px; margin-left: 5px"
                  :src="require('../../../assets/logo/warning.png')"
                  :fit="fit"
                ></el-image>
              </el-tooltip>
            </template>
          </el-table-column>
@@ -267,10 +267,10 @@
              >
                <div slot="content">{{ "季度款金额异常" }}</div>
                <el-image
                style="width: 12px; height: 12px;margin-left:5px"
                :src="require('../../../assets/logo/warning.png')"
                :fit="fit"
              ></el-image>
                  style="width: 12px; height: 12px; margin-left: 5px"
                  :src="require('../../../assets/logo/warning.png')"
                  :fit="fit"
                ></el-image>
              </el-tooltip>
            </template>
          </el-table-column>
@@ -288,10 +288,10 @@
              >
                <div slot="content">{{ "过度补贴数据异常" }}</div>
                <el-image
                style="width: 12px; height: 12px;margin-left:5px"
                :src="require('../../../assets/logo/warning.png')"
                :fit="fit"
              ></el-image>
                  style="width: 12px; height: 12px; margin-left: 5px"
                  :src="require('../../../assets/logo/warning.png')"
                  :fit="fit"
                ></el-image>
              </el-tooltip>
            </template>
          </el-table-column>
@@ -576,7 +576,7 @@

      const params = {
        applyId: Number(this.id), // 确保是数字类型
        reason: this.form.auditComment.trim()||'',
        reason: this.form.auditComment ? this.form.auditComment.trim() : "",
        status: Number(this.form.auditResult === "通过" ? 1 : 2), // 确保是数字类型
      };


 src/views/relocatablePersonnel/add.vue

@@ -251,7 +251,7 @@
            endDateOptions: {
                disabledDate: (time) => {
                    if (this.form.lastBeginTime) {
                        return time.getTime() < this.form.lastBeginTime.getTime()
                        return time.getTime() < new Date(this.form.lastBeginTime).getTime()
                    }
                    return false
                }

 src/views/relocatablePersonnel/detail.vue

@@ -283,7 +283,7 @@
            endDateOptions: {
                disabledDate: (time) => {
                    if (this.form.lastBeginTime) {
                        return time.getTime() < this.form.lastBeginTime.getTime()
                        return time.getTime() < new Date(this.form.lastBeginTime).getTime()
                    }
                    return false
                }