Merge branch 'master' into dev-3.4.2.10

zhengyiming

5 天以前 60107cb11e472d693de543e8ec422bfe8e31dbec

 src/views/MaterialReview/MaterialReviewDetail.vue

@@ -5,16 +5,32 @@
        <template #title>
          <div class="page-form-layout-title">
            申报详情
            <span class="page-form-layout-title-item status">
              审核状态:<span :style="{ color: BountyCheckStatusEnumColor[form.outCheckStatus] }">{{
                BountyCheckStatusEnumText[form.outCheckStatus]
              }}</span>
            </span>
            <span class="page-form-layout-title-item remark">
              <TextOverTooltip v-if="form.outCheckStatus === BountyCheckStatusEnum.CheckReject">
                {{ `审核未通过原因:${form.outCheckRemark ?? ''}` }}
              </TextOverTooltip>
            </span>
            <template v-if="isReReview">
              <span class="page-form-layout-title-item status">
                复审状态:<span
                  :style="{ color: BountyCheckStatusEnumColor[form.outReCheckStatus] }"
                  >{{ BountyCheckStatusEnumText[form.outCheckStatus] }}</span
                >
              </span>
              <span class="page-form-layout-title-item remark">
                <TextOverTooltip v-if="form.outCheckStatus === BountyCheckStatusEnum.CheckReject">
                  {{ `复审未通过原因:${form.outCheckRemark ?? ''}` }}
                </TextOverTooltip>
              </span>
            </template>
            <template v-else>
              <span class="page-form-layout-title-item status">
                审核状态:<span
                  :style="{ color: BountyCheckStatusEnumColor[form.outCheckStatus] }"
                  >{{ BountyCheckStatusEnumText[form.outCheckStatus] }}</span
                >
              </span>
              <span class="page-form-layout-title-item remark">
                <TextOverTooltip v-if="form.outCheckStatus === BountyCheckStatusEnum.CheckReject">
                  {{ `审核未通过原因:${form.outCheckRemark ?? ''}` }}
                </TextOverTooltip>
              </span>
            </template>
          </div>
        </template>
        <DetailView :form="form">
@@ -31,7 +47,6 @@
              v-bind="dialogProps"
              :show-upload-btn="false"
              :show-delete-btn="false"
              :show-check-btn="false"
            />
          </ChunkCellV2>
        </DetailView>
@@ -76,6 +91,9 @@
const route = useRoute();
const { closeViewPush } = useRouteView();
const id = route.params?.id as string;
const type = route.query?.type as string;
//是否复审
const isReReview = type === 'reReview';
const form = reactive({
  batchNo: '',
  parkName: '',
@@ -87,14 +105,21 @@
  parkCollectFileList: [] as CustomerApplyFileTypeListItem[],
  calculationFileList: [] as CustomerApplyFileTypeListItem[],

  extraListFiles: [] as CustomerApplyFileTypeListItem[],

  outCheckStatus: '' as any as BountyCheckStatusEnum,
  outCheckRemark: '',

  outReCheckStatus: '' as any as BountyCheckStatusEnum,
  outReCheckRemark: '',

  suportPlatRecharge: false,
  suportFinance: false,
});

const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
  suportPlatRecharge: toRef(form, 'suportPlatRecharge'),
  suportFinance: toRef(form, 'suportFinance'),
});

const { extraParamState, getList, reset, proTableProps, operationBtns, dialogProps } =
@@ -126,14 +151,20 @@
    form.settleSumAmount = data.settleSumAmount;
    form.outCheckStatus = data.outCheckStatus;
    form.outCheckRemark = data.outCheckRemark;
    form.outReCheckStatus = data.outReCheckStatus;
    form.outReCheckRemark = data.outReCheckRemark;
    form.parkCollectFileList = EnterpriseApplyFileUtils.convertApiFileToParkCollectFileList(
      data.listFiles
    );
    form.calculationFileList = EnterpriseApplyFileUtils.convertApiFileToParkCollectFileList(
      data.collectCountListFiles
    );
    form.extraListFiles = EnterpriseApplyFileUtils.convertApiFileToExtraListFiles(
      data.extraListFiles
    );

    form.suportPlatRecharge = data.suportPlatRecharge;
    form.suportFinance = data.suportFinance;

    getList();
  },