wupengfei
5 天以前 21b5e8493c08bc62b77e4314c1ad9f641c947267
feat: 1.2.0.1
4个文件已修改
37 ■■■■■ 已修改文件
src/hooks/settlement.ts 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ServiceChargeManage/components/SettlMethodDialog.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ServiceChargeManage/components/SettleDetailDialog.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/hooks/settlement.ts
@@ -41,5 +41,14 @@
  const enterpriseWalletAccessSelect = computed(() => data.value?.map((x) => x.data));
  return { enterpriseWalletAccessSelect };
  const settlementAccessList = computed(() => {
    return enterpriseWalletAccessSelect.value?.length > 0
      ? enterpriseWalletAccessSelect.value.map((x) => ({
          label: EnumEnterpriseWalletAccessTextForSettle[x.access],
          value: x.access,
        }))
      : [];
  });
  return { settlementAccessList };
}
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -304,7 +304,7 @@
          >
            <ProFormSelect
              v-model="form.settlementAccess"
              :value-enum="EnumEnterpriseWalletAccessText"
              :value-enum="settlementAccessList"
              :disabled="isEdit"
              placeholder="请选择结算方式"
            ></ProFormSelect>
@@ -367,6 +367,8 @@
const id = route.params.id as string;
const isEdit = !!id;
const { settlementAccessList } = useEnterpriseWalletAccessSelect();
function disabledDate(time: Date) {
  return dayjs(time).isBefore(dayjs(), 'day');
}
src/views/ServiceChargeManage/components/SettlMethodDialog.vue
@@ -41,16 +41,7 @@
  settlementAccess: EnumEnterpriseWalletAccess;
};
const { enterpriseWalletAccessSelect } = useEnterpriseWalletAccessSelect();
const settlementAccessList = computed(() => {
  return enterpriseWalletAccessSelect.value?.length > 0
    ? enterpriseWalletAccessSelect.value.map((x) => ({
        label: EnumEnterpriseWalletAccessTextForSettle[x.access],
        value: x.access,
      }))
    : [];
});
const { settlementAccessList } = useEnterpriseWalletAccessSelect();
const visible = defineModel({ type: Boolean });
src/views/ServiceChargeManage/components/SettleDetailDialog.vue
@@ -66,16 +66,7 @@
  settlementAccess: EnumEnterpriseWalletAccess;
};
const { enterpriseWalletAccessSelect } = useEnterpriseWalletAccessSelect();
const settlementAccessList = computed(() => {
  return enterpriseWalletAccessSelect.value?.length > 0
    ? enterpriseWalletAccessSelect.value.map((x) => ({
        label: EnumEnterpriseWalletAccessTextForSettle[x.access],
        value: x.access,
      }))
    : [];
});
const { settlementAccessList } = useEnterpriseWalletAccessSelect();
const visible = defineModel({ type: Boolean });