From 01e7edf41912e62d4a1b5a137d30cebf5609303d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 16 九月 2025 15:06:36 +0800
Subject: [PATCH] Merge branch 'dev-v1.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-v1.1

---
 src/views/EmploymentManage/components/AddOrEditEmploymentView.vue |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index c46c0de..dd76add 100644
--- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
+++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -62,25 +62,25 @@
                   v-model="form.settlementCycle"
                   :value-enum="EnumSettlementCycleText"
                   :button-style="false"
+                  @change="handleSettlementCycleChange"
                 ></ProFormRadio>
               </ProFormItemV2>
             </ProFormColItem>
           </ProFormCol>
           <ProFormCol>
-            <ProFormColItem :span="12">
+            <ProFormColItem :span="12" class="settlement-cycle-date-form-item">
               <ProFormItemV2
                 label="缁撶畻鏃ユ湡:"
                 prop="settlementCycle"
                 :check-rules="[{ message: '璇烽�夋嫨缁撶畻鏃ユ湡' }]"
-                class="settlement-cycle-date-form-item"
               >
                 {{ EnumSettlementCycleDateText[form.settlementCycle] }}
                 <ProFormSelect
-                  v-model="form.settlementCycle"
-                  :value-enum="[]"
+                  v-model="form.settlementDate"
+                  :value-enum="settlementDateList"
                   :button-style="false"
                 ></ProFormSelect>
-                {{ '鏃ョ粨绠�' }}
+                {{ '缁撶畻' }}
               </ProFormItemV2>
             </ProFormColItem>
           </ProFormCol>
@@ -139,6 +139,7 @@
                   v-model="form.ageMaxLimit"
                   placeholder="璇疯緭鍏�"
                 ></ProFormInputNumber>
+                宀�
               </ProFormItemV2>
             </ProFormColItem>
           </ProFormCol>
@@ -258,6 +259,8 @@
   EnumBillingMethodUnitText,
   EnumSettlementCycleText,
   EnumSettlementCycleDateText,
+  EnumSettlementCycleDateMonthArray,
+  EnumSettlementCycleDateWeekArray,
 } from '@/constants';
 import { format, FormValidator } from '@/utils';
 import dayjs from 'dayjs';
@@ -287,6 +290,16 @@
   categoryCode: CategoryCode.CertificateType,
 });
 
+const settlementDateList = computed(() => {
+  if (form.settlementCycle === EnumSettlementCycle.Month) {
+    return EnumSettlementCycleDateMonthArray;
+  }
+  if (form.settlementCycle === EnumSettlementCycle.Week) {
+    return EnumSettlementCycleDateWeekArray;
+  }
+  return [];
+});
+
 const state = reactive({
   checkBenefitsAll: false,
   isBenefitsIndeterminate: false,
@@ -300,6 +313,7 @@
   billingMethod: EnumBillingMethod.Day,
   serviceFee: null,
   settlementCycle: EnumSettlementCycle.Day,
+  settlementDate: null as number,
   benefits: [] as string[],
   ageMinLimit: null,
   ageMaxLimit: null,
@@ -326,6 +340,7 @@
     form.billingMethod = data.billingMethod;
     form.serviceFee = data.serviceFee;
     form.settlementCycle = data.settlementCycle;
+    form.settlementDate = data.settlementDate;
     form.benefits = data.benefits?.map((x) => x.benefitCode) ?? [];
     form.ageMinLimit = data.ageMinLimit;
     form.ageMaxLimit = data.ageMaxLimit;
@@ -349,6 +364,10 @@
   enabled: isEdit,
 });
 
+function handleSettlementCycleChange() {
+  form.settlementDate = null as number;
+}
+
 function handleBack() {
   closeViewPush(route, {
     name: 'TaskManageList',
@@ -367,12 +386,12 @@
 }
 async function submit() {
   try {
-    console.log('form.weMapInfo: ', form.weMapInfo);
     let params: API.SaveTaskInfoCommand = {
       name: form.name,
       billingMethod: form.billingMethod,
       serviceFee: form.serviceFee,
       settlementCycle: form.settlementCycle,
+      settlementDate: form.settlementDate,
       benefits: form.benefits,
       ageMinLimit: form.ageMinLimit,
       ageMaxLimit: form.ageMaxLimit,
@@ -456,6 +475,10 @@
         min-width: 0;
         flex: 1;
       }
+
+      .pro-from-item-read-content-wrapper {
+        width: auto;
+      }
     }
   }
 }

--
Gitblit v1.9.1