From 5cecbfb391336cb21ab6f8761f6b667b05504241 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 07 十一月 2025 17:51:41 +0800
Subject: [PATCH] Merge branch 'dev-1.3.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.3.0.1
---
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 38 +++++++++++++++++++++++++++++++-------
apps/bMiniApp/project.private.config.json | 4 ++--
2 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/apps/bMiniApp/project.private.config.json b/apps/bMiniApp/project.private.config.json
index fbd315d..e028c64 100644
--- a/apps/bMiniApp/project.private.config.json
+++ b/apps/bMiniApp/project.private.config.json
@@ -26,8 +26,8 @@
"name": "浜哄憳璇︽儏",
"pathName": "subpackages/task/taskHandleCheckDetail/taskHandleCheckDetail",
"query": "id=d4ff597f-20e3-41ff-87a4-08de1dbc63e7&date=2025-11-07&taskInfoId=b0e79981-56d5-4730-83e7-08de1d1fb9dd",
- "scene": null,
- "launchMode": "default"
+ "launchMode": "default",
+ "scene": null
},
{
"name": "楠屾敹璇︽儏",
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index 2eef3c4..130b2c3 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -12,6 +12,7 @@
v-model="form.supplierEnterpriseId"
placeholder="璇烽�夋嫨渚涘簲鍟�"
:value-enum="supplierEnterpriseSelect"
+ :disabled="isEdit"
/>
</nut-form-item>
<nut-form-item label="浠诲姟鍚嶇О:" class="bole-form-item" prop="name" label-width="90px">
@@ -44,9 +45,13 @@
label-position="top"
>
<nut-radio-group v-model="form.billingMethod" direction="horizontal">
- <BlRadio :label="Number(key)" v-for="(val, key) in EnumBillingMethodText" :key="key">{{
- val
- }}</BlRadio>
+ <BlRadio
+ :label="Number(key)"
+ v-for="(val, key) in EnumBillingMethodText"
+ :key="key"
+ :disabled="feeCannotEdit"
+ >{{ val }}</BlRadio
+ >
</nut-radio-group>
</nut-form-item>
<nut-form-item
@@ -65,6 +70,7 @@
:max="999999999999"
:precision="2"
type="text"
+ :disabled="feeCannotEdit"
/>
<div class="form-input-unit">{{ BillingMethodEnumUnit[form.billingMethod] }}</div>
</div>
@@ -85,6 +91,7 @@
:max="999999999999"
:precision="2"
type="text"
+ :disabled="feeCannotEdit"
/>
<div class="form-input-unit">{{ '灏忔椂/澶�' }}</div>
</div>
@@ -104,6 +111,7 @@
:max="999999999999"
:precision="2"
type="text"
+ :disabled="feeCannotEdit"
/>
<div class="form-input-unit">{{ '鍏�/灏忔椂' }}</div>
</div>
@@ -125,6 +133,7 @@
:max="999999999999"
:precision="2"
type="text"
+ :disabled="feeCannotEdit"
/>
<div class="form-input-unit">{{ '浠�' }}</div>
</div>
@@ -141,9 +150,13 @@
direction="horizontal"
@change="settleTypeChange"
>
- <BlRadio :label="Number(key)" v-for="(val, key) in EnumSettlementCycleText" :key="key">{{
- val
- }}</BlRadio>
+ <BlRadio
+ :label="Number(key)"
+ v-for="(val, key) in EnumSettlementCycleText"
+ :key="key"
+ :disabled="feeCannotEdit"
+ >{{ val }}</BlRadio
+ >
</nut-radio-group>
</nut-form-item>
<nut-form-item
@@ -288,7 +301,7 @@
<nut-form-item
label="楠屾敹鏂瑰紡:"
class="bole-form-item"
- prop="checkReceiveMethod"
+ prop="checkReceiveMethods"
label-width="90px"
>
<!-- <nut-radio-group v-model="form.checkReceiveMethod" direction="horizontal">
@@ -301,6 +314,7 @@
</nut-radio-group> -->
<nut-checkbox-group v-model="form.checkReceiveMethods">
<nut-checkbox
+ :disabled="isEdit"
v-for="(val, key) in EnumTaskCheckReceiveMethodText"
:key="key"
:label="Number(key) as any"
@@ -403,6 +417,10 @@
: nowDate;
});
+const feeCannotEdit = computed(() => {
+ return dayjs().isAfter(form.beginTime, 'second') && isEdit;
+});
+
const { dictionaryDataList: WelfareTypeList } = useDictionaryDataSelect({
categoryCode: CategoryCode.Welfare,
});
@@ -550,6 +568,12 @@
},
},
],
+ checkReceiveMethods: [
+ {
+ required: true,
+ message: '璇烽�夋嫨楠屾敹鏂瑰紡',
+ },
+ ],
});
const { settlementAccessList } = useEnterpriseWalletAccessSelect({
--
Gitblit v1.10.0