From 04521ee7263d6e99b00b909a0cc70773c5207ff7 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 19 九月 2025 15:48:25 +0800
Subject: [PATCH] fix: bug

---
 src/views/EmploymentManage/components/AddOrEditEmploymentView.vue |   90 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
index 47fdecc..c2ea175 100644
--- a/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
+++ b/src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -44,6 +44,8 @@
                       :controls="false"
                       v-model="form.serviceFee"
                       placeholder="璇疯緭鍏�"
+                      :min="0"
+                      :max="999999999999"
                       :unit="EnumBillingMethodUnitText[form.billingMethod]"
                     ></ProFormInputNumber>
                   </template>
@@ -62,7 +64,26 @@
                   v-model="form.settlementCycle"
                   :value-enum="EnumSettlementCycleText"
                   :button-style="false"
+                  @change="handleSettlementCycleChange"
                 ></ProFormRadio>
+              </ProFormItemV2>
+            </ProFormColItem>
+          </ProFormCol>
+          <ProFormCol>
+            <ProFormColItem :span="12" class="settlement-cycle-date-form-item">
+              <ProFormItemV2
+                v-if="form.settlementCycle !== EnumSettlementCycle.Day"
+                label="缁撶畻鏃ユ湡:"
+                prop="settlementCycle"
+                :check-rules="[{ message: '璇烽�夋嫨缁撶畻鏃ユ湡' }]"
+              >
+                {{ EnumSettlementCycleDateText[form.settlementCycle] }}
+                <ProFormSelect
+                  v-model="form.settlementDate"
+                  :value-enum="settlementDateList"
+                  :button-style="false"
+                ></ProFormSelect>
+                {{ '缁撶畻' }}
               </ProFormItemV2>
             </ProFormColItem>
           </ProFormCol>
@@ -110,17 +131,18 @@
               >
                 <ProFormInputNumber
                   :controls="false"
-                  :min="1"
+                  :min="16"
                   v-model="form.ageMinLimit"
                   placeholder="璇疯緭鍏�"
                 ></ProFormInputNumber>
                 <div class="form-input-separator">鑷�</div>
                 <ProFormInputNumber
                   :controls="false"
-                  :min="1"
+                  :min="16"
                   v-model="form.ageMaxLimit"
                   placeholder="璇疯緭鍏�"
                 ></ProFormInputNumber>
+                宀�
               </ProFormItemV2>
             </ProFormColItem>
           </ProFormCol>
@@ -134,9 +156,6 @@
                 <ProFormRadio
                   v-model="form.genderLimit"
                   :value-enum="EnumUserGenderTextForEdit"
-                  show-all-btn
-                  :all-btn-label="'涓嶉檺'"
-                  :allBtnValue="0"
                 ></ProFormRadio>
               </ProFormItemV2>
             </ProFormColItem>
@@ -165,9 +184,7 @@
               <ProFormItemV2
                 label="浠诲姟鍦扮偣:"
                 prop="weMapInfo"
-                :check-rules="[
-                  { message: '璇烽�夋嫨浠诲姟鍦扮偣', validator: FormValidator.validatorWeMap },
-                ]"
+                :check-rules="[{ message: '璇烽�夋嫨浠诲姟鍦扮偣', type: 'weMap' }]"
               >
                 <WeMap v-if="!isDetail" v-model="form.weMapInfo" />
                 <div v-else>
@@ -204,6 +221,7 @@
                   range-separator="鑷�"
                   start-placeholder="寮�濮嬫棩鏈�"
                   end-placeholder="缁撴潫鏃ユ湡"
+                  :disabled-date="disabledDate"
                 ></ProFormDatePicker>
               </ProFormItemV2>
             </ProFormColItem>
@@ -231,6 +249,7 @@
   ProFormRadio,
   ProFormDatePicker,
   ProFormCheckbox,
+  ProFormSelect,
 } from '@bole-core/components';
 import { FormInstance, ModelValueType } from 'element-plus';
 import { Message } from '@bole-core/core';
@@ -242,6 +261,10 @@
   EnumBillingMethodText,
   EnumBillingMethodUnitText,
   EnumSettlementCycleText,
+  EnumSettlementCycleDateText,
+  EnumSettlementCycleDateMonthArray,
+  EnumSettlementCycleDateWeekArray,
+  EnumSettlementCycle,
 } from '@/constants';
 import { format, FormValidator } from '@/utils';
 import dayjs from 'dayjs';
@@ -257,6 +280,10 @@
 const id = route.params.id as string;
 const isEdit = !!id;
 
+function disabledDate(time: Date) {
+  return dayjs(time).isBefore(dayjs(), 'day');
+}
+
 const eventContext = useGlobalEventContext();
 
 const { closeViewPush } = useRouteView();
@@ -265,6 +292,16 @@
 });
 const { dictionaryDataList: certificateTypeList } = useDictionaryDataSelect({
   categoryCode: CategoryCode.CertificateType,
+});
+
+const settlementDateList = computed(() => {
+  if (form.settlementCycle === EnumSettlementCycle.Month) {
+    return EnumSettlementCycleDateMonthArray;
+  }
+  if (form.settlementCycle === EnumSettlementCycle.Week) {
+    return EnumSettlementCycleDateWeekArray;
+  }
+  return [];
 });
 
 const state = reactive({
@@ -277,12 +314,13 @@
 
 const form = reactive({
   name: '',
-  billingMethod: '' as any as EnumBillingMethod,
-  serviceFee: 0,
-  settlementCycle: '' as any as EnumSettlementCycle,
+  billingMethod: EnumBillingMethod.Day,
+  serviceFee: null,
+  settlementCycle: EnumSettlementCycle.Day,
+  settlementDate: null as number,
   benefits: [] as string[],
-  ageMinLimit: 0,
-  ageMaxLimit: 0,
+  ageMinLimit: null,
+  ageMaxLimit: null,
   genderLimit: 0 as any as EnumUserGender,
   credentialLimits: [] as string[],
   time: [] as unknown as ModelValueType,
@@ -306,6 +344,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;
@@ -329,6 +368,10 @@
   enabled: isEdit,
 });
 
+function handleSettlementCycleChange() {
+  form.settlementDate = null as number;
+}
+
 function handleBack() {
   closeViewPush(route, {
     name: 'TaskManageList',
@@ -347,12 +390,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 ? form.settlementDate : 0,
       benefits: form.benefits,
       ageMinLimit: form.ageMinLimit,
       ageMaxLimit: form.ageMaxLimit,
@@ -423,5 +466,24 @@
       width: auto;
     }
   }
+
+  .settlement-cycle-date-form-item {
+    color: inherit;
+
+    .el-form-item__content {
+      flex-wrap: nowrap;
+
+      .el-select {
+        margin: 0 20px;
+        width: auto;
+        min-width: 0;
+        flex: 1;
+      }
+
+      .pro-from-item-read-content-wrapper {
+        width: auto;
+      }
+    }
+  }
 }
 </style>

--
Gitblit v1.9.1