From 354fa08d53f4cd97014bfb0008c8c5f0326bbdd3 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 11 八月 2025 09:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

---
 apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue |   55 +++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index 8e810c9..9d19582 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -20,11 +20,11 @@
       </nut-form-item>
       <nut-form-item label=" " class="bole-form-item" prop="serviceFee" label-width="0">
         <div class="bole-form-input-wrapper">
-          <nut-input
+          <NumberInput
             v-model.trim="form.serviceFee"
             class="nut-input-text bole-input-text"
             placeholder="璇疯緭鍏ユ湇鍔¤垂"
-            type="text"
+            :min="0"
           />
           <div class="form-input-unit">{{ BillingMethodEnumUnit[form.billingMethod] }}</div>
         </div>
@@ -83,7 +83,7 @@
         <ChooseInputWithPicker
           v-model="form.genderLimit"
           placeholder="璇烽�夋嫨鎬у埆瑕佹眰"
-          :value-enum="EnumUserGenderText"
+          :value-enum="EnumUserGenderTextOptions"
         />
       </nut-form-item>
       <nut-form-item
@@ -122,10 +122,16 @@
         prop="beginTime"
         label-width="90px"
       >
-        <ChooseInputWithDatePicker v-model="form.beginTime"></ChooseInputWithDatePicker>
+        <ChooseInputWithDatePicker
+          v-model="form.beginTime"
+          :minDate="nowDate"
+        ></ChooseInputWithDatePicker>
       </nut-form-item>
       <nut-form-item label="浠诲姟缁撴潫鏃ユ湡:" class="bole-form-item" prop="endTime" label-width="90px">
-        <ChooseInputWithDatePicker v-model="form.endTime"></ChooseInputWithDatePicker>
+        <ChooseInputWithDatePicker
+          v-model="form.endTime"
+          :minDate="nowDate"
+        ></ChooseInputWithDatePicker>
       </nut-form-item>
     </nut-form>
   </ContentScrollView>
@@ -146,6 +152,7 @@
   EnumUserGenderText,
   EnumSettlementCycleText,
   BillingMethodEnumUnit,
+  EnumUserGenderTextOptions,
 } from '@12333/constants';
 import {
   ChooseInputWithPicker,
@@ -178,6 +185,8 @@
 const isCopy = router.params?.isCopy === 'true';
 console.log('isCopy: ', router.params?.isCopy);
 
+const nowDate = dayjs().toDate();
+
 const { dictionaryDataList: WelfareTypeList } = useDictionaryDataSelect({
   categoryCode: CategoryCode.Welfare,
 });
@@ -193,7 +202,7 @@
   benefits: [] as string[],
   ageMinLimit: 0,
   ageMaxLimit: 0,
-  genderLimit: '' as any as EnumUserGender,
+  genderLimit: 0 as any as EnumUserGender,
   credentialLimits: [] as string[],
   // address: '',
   beginTime: '',
@@ -208,7 +217,21 @@
   name: [{ required: true, message: '璇疯緭鍏ヤ换鍔″悕绉�' }],
   genderLimit: [{ required: true, message: '璇烽�夋嫨鎬у埆瑕佹眰' }],
   addressDetail: [{ required: true, message: '璇疯緭鍏ヨ缁嗗湴鍧�' }],
-
+  billingMethod: [
+    {
+      required: true,
+      message: '璇烽�夋嫨鏀惰垂鏂瑰紡',
+      validator: () => {
+        if (!form.billingMethod) {
+          return Promise.reject('璇烽�夋嫨鏈嶅姟璐圭被鍨�');
+        }
+        if (!form.serviceFee) {
+          return Promise.reject('璇疯緭鍏ユ湇鍔¤垂');
+        }
+        return Promise.resolve(true);
+      },
+    },
+  ],
   weMapInfo: [
     { required: true, message: '璇疯缃伐浣滃湴鐐�', validator: FormValidator.validatorWeMap },
   ],
@@ -276,17 +299,17 @@
     form.billingMethod = data.billingMethod;
     form.serviceFee = data.serviceFee;
     form.settlementCycle = data.settlementCycle;
-    form.benefits = (data.benefits ?? []).map((item) => item.code);
+    form.benefits = (data.benefits ?? []).map((item) => item.benefitCode);
     form.ageMinLimit = data.ageMinLimit;
     form.ageMaxLimit = data.ageMaxLimit;
     form.genderLimit = data.genderLimit;
-    form.credentialLimits = (data.credentialLimits ?? []).map((item) => item.code);
-    form.beginTime = dayjs(data.beginTime).format('YYYY-MM-DD');
-    form.endTime = dayjs(data.endTime).format('YYYY-MM-DD');
+    form.credentialLimits = (data.credentialLimits ?? []).map((item) => item.typeCode);
+    form.beginTime = dayjs(data.beginTime).format('YYYY-MM-DD 00:00:00');
+    form.endTime = dayjs(data.endTime).format('YYYY-MM-DD 23:59:59');
     form.addressDetail = data.addressDetail;
     form.weMapInfo = {
-      provinceName: findAreaNameFromCode(data.provinceCode),
-      cityName: findAreaNameFromCode(data.cityCode),
+      provinceName: data.provinceContent,
+      cityName: data.cityContent,
       provinceCode: data.provinceCode,
       cityCode: data.cityCode,
       latitude: data.latitude,
@@ -324,8 +347,8 @@
       addressDetail: form.addressDetail,
       longitude: form.weMapInfo.longitude,
       latitude: form.weMapInfo.latitude,
-      beginTime: form.beginTime,
-      endTime: form.endTime,
+      beginTime: dayjs(form.beginTime).format('YYYY-MM-DD 00:00:00'),
+      endTime: dayjs(form.endTime).format('YYYY-MM-DD 23:59:59'),
     };
     if (isEdit) {
       params.id = taskId;
@@ -345,7 +368,7 @@
 }
 
 function handleCancel() {
-  Taro.navigateBack();
+  goBack();
 }
 </script>
 

--
Gitblit v1.9.1